Changeset 421 for dsfilters/demux_mpc/src/mpc_file.cpp

Timestamp:

01/18/09 18:17:12 (15 years ago)

Author:

radscorpion

Message:

Demuxer updated to 0.4.0.0
Support for APE 2.0 tags
Chapters are now supported

File:

• dsfilters/demux_mpc/src/mpc_file.cpp (modified) (4 diffs)

dsfilters/demux_mpc/src/mpc_file.cpp

@@ -37 +37 @@
 CMPCFile::~CMPCFile()
 {
+        ClearChapters();
         if (seek_table) { free(seek_table); seek_table = NULL; }
         if (extradata) { free(extradata); extradata = NULL; }
+}
+
+void CMPCFile::ClearChapters()
+{
+        for (int i=0; i<chapters.size(); i++) {
+                CMPCChapter     *chap = chapters[i];
+                delete chap;
+        }
+        chapters.clear();
 }
 
@@ -106 +116 @@
                 if (ret < 0) return ret;
 
+                // if there is a sequence of chapters it MUST follow the seeking table
+                while (true) {
+                        ret = packet.Load(reader);
+                        if (ret < 0) break;
+
+                        if (packet.key == MPC_KEY('C','T')) {
+                                CMPCChapter             *chap = new CMPCChapter();
+                                ret = chap->Load(&packet);
+                                if (ret < 0) {
+                                        delete chap;
+                                } else {                                        
+                                        if (chap->caption == _T("")) {
+                                                chap->caption.Format(_T("Chapter %d"), (int)chapters.size() + 1);
+                                        }
+                                        chapters.push_back(chap);
+                                }
+                        } else {
+                                break;
+                        }
+                }
+
                 // seek back to first AP
                 reader->Seek(first_ap_pos);
@@ -256 +287 @@
         HRESULT         hr;
         int                     ret;
+
+        //-------------------------------------------------------------------------
+        //
+        //      Load APE Tag
+        //
+        //-------------------------------------------------------------------------
+
+        // try to load the APE Tag
+        __int64         size, avail;
+        int                     tagsize = 0;
+        reader->GetSize(&avail, &size);
+
+        tag.Clear();
+        if (size >= 32) {
+                BYTE            temp[32];
+
+                reader->Seek(size - 32);
+                reader->Read(temp, 32);
+
+                ret = tag.ReadFooter(temp, 32, &tagsize);
+                if (ret == 0 && tagsize > 0) {
+                        // seek this many bytes back
+                        reader->Seek(size - 32 - tagsize);
+                        
+                        // also load the footer
+                        tagsize += 32;
+                        BYTE            *apetag = (BYTE*)malloc(tagsize);
+                        if (apetag) {
+                                reader->Read(apetag, tagsize);
+
+                                ret = tag.ReadTag(apetag, tagsize);
+                                if (ret < 0) {
+                                        tag.Clear();
+                                }
+
+                                free(apetag);
+                        }
+                }
+        }
+
+        //-------------------------------------------------------------------------
+        //
+        //      Load MPC file
+        //
+        //-------------------------------------------------------------------------
 
         // keep a local copy of the reader
@@ -662 +738 @@
 }
 
-
+//-----------------------------------------------------------------------------
+//
+//      CMPCChapter
+//
+//-----------------------------------------------------------------------------
+
+CMPCChapter::CMPCChapter()
+{
+        sample_offset           = 0;
+        chapter_gain_db         = 0;
+        chapter_peak_db         = 0;
+}
+
+CMPCChapter::~CMPCChapter()
+{
+}
+
+int CMPCChapter::Load(CMPCPacket *packet)
+{
+        Bitstream       b(packet->payload);
+        b.NeedBits();
+
+        sample_offset = b.GetMpcSize();
+
+        int16   val;
+        b.NeedBits();   val = b.SGetBits(16);   chapter_gain_db = val / 256.0;
+        b.NeedBits();   val = b.UGetBits(16);   chapter_peak_db = val;
+
+        if (chapter_gain_db != 0) chapter_gain_db = OLD_GAIN_REF - chapter_gain_db;
+        if (chapter_peak_db != 0) {
+                chapter_peak_db = pow((double)10.0, (double)(chapter_peak_db / (20*256))) / (double)(1 << 15);
+        }
+
+        BYTE            *buf = b.Position();
+        BYTE            *end = packet->payload + packet->payload_size;
+
+        // let's try to load the APE Tag
+        APE_Tag         tag;
+        int ret = tag.ReadTag(buf, end-buf, true);
+        if (ret == 0) {
+
+                CString         title   = tag.FindName(_T("title"));
+                CString         track   = tag.FindName(_T("track"));
+                
+                if (track != _T("")) {
+                        caption.Format(_T("%s [%s]"), title.GetBuffer(), track.GetBuffer());
+                } else {
+                        caption = title;
+                }
+                caption.Trim();
+        
+        } else {
+                caption = _T("");
+        }
+
+        return 0;
+}
+
+