Ticket #3696: mtd.patch

jobthread.cpp

@@ -331 +331 @@
     //  Can't do much until I have a
     //  lock on the device
     //
+    dvdnav_t *dvdnav;
+    int finished, len, event;
+    uint8_t packetBuf[DVD_VIDEO_LB_LEN];
+    uint8_t *blockBuf;
 
+    dvdnav_status_t dvdRet;
+
+    int32_t titleParts   = 0;
+    int32_t curTitle     = 0;
+    int32_t curTitlePart = 0;
+    int32_t prevTitle     = 0;
+    int32_t prevTitlePart = 0;
+
     bool loop = true;
-    
+
     setSubName(QObject::tr("Waiting For Access to DVD"), 1);
 
     while(loop)
@@ -354 +366 @@
                 return false;
             }
         }
-    }    
+    }
 
     MutexUnlocker qmul(dvd_device_access);
 
@@ -366 +378 @@
 
     sendLoggingEvent("job thread beginning to rip dvd title");
 
-    
+
     //
-    //  OK, we got the device. 
+    //  OK, we got the device.
     //  Lets open our destination file
     //
-    
+
     RipFile ripfile(to_location, extension, true);
     if(!ripfile.open(IO_WriteOnly | IO_Raw | IO_Truncate, multiple_files))
     {
@@ -380 +392 @@
         return false;
     }
 
+    QTime job_time;
+    job_time.start();
+
     //
-    //  Time to open up access with all 
+    //  Time to open up access with all
     //  the funky structs from libdvdnav
     //
-    
-    int angle = 0;  // Change that at some point
+    dvdRet = dvdnav_open(&dvdnav, dvd_device_location);
 
-    SmartHandle<dvd_reader_t *> the_dvd(DVDOpen(dvd_device_location),
-            DVDClose);
-    if(!the_dvd.get())
+    if (dvdRet == DVDNAV_STATUS_ERR)
     {
-        problem(QString("DVDPerfectThread could not access this dvd device: %1").arg(dvd_device_location));
+        problem(QString("Failed to open DVD devise: %1 (%2)\n").arg(dvd_device_location).arg(dvdnav_err_to_string(dvdnav)));
+        dvdnav_close(dvdnav);
         return false;
     }
+    dvdnav_set_readahead_flag(dvdnav, 1);
+    dvdnav_set_PGC_positioning_flag(dvdnav, 1);
 
-
-    SmartHandle<ifo_handle_t *> vmg_file(ifoOpen(the_dvd.get(), 0), ifoClose);
-    if(!vmg_file.get())
+    dvdnav_title_play(dvdnav, 0);
+    dvdRet = dvdnav_get_next_cache_block(dvdnav, &blockBuf, &event, &len);
+    if (dvdRet == DVDNAV_STATUS_ERR)
     {
-        problem("DVDPerfectThread could not open VMG info.");
+        problem(QString("Error Getting Next Block (%1)\n").arg(dvdnav_err_to_string(dvdnav)));
+        dvdnav_free_cache_block(dvdnav, blockBuf);
+        dvdnav_close(dvdnav);
         return false;
     }
-    tt_srpt_t *tt_srpt = vmg_file->tt_srpt;
+    dvdnav_free_cache_block(dvdnav, blockBuf);
 
-    //
-    //  Check title # is valid
-    //
-
-    if(title_number < 0 || title_number > tt_srpt->nr_of_srpts )
+    dvdnav_title_play(dvdnav, title_number + 1);
+    dvdRet = dvdnav_get_number_of_parts(dvdnav, title_number + 1, &titleParts);
+    sendLoggingEvent(QString("Title %1 has %2 Parts\n").arg(title_number + 1).arg(titleParts));
+    if (dvdRet == DVDNAV_STATUS_ERR)
     {
-        problem(QString("DVDPerfectThread could not open title number %1").arg(title_number + 1));
+        problem(QString("Failed to get number of parts: %1\n").arg(dvdnav_err_to_string(dvdnav)));
+        dvdnav_free_cache_block(dvdnav, blockBuf);
+        dvdnav_close(dvdnav);
         return false;
     }
 
-    SmartHandle<ifo_handle_t *> vts_file(
-            ifoOpen(the_dvd.get(), tt_srpt->title[title_number].title_set_nr),
-            ifoClose);
-    if(!vts_file.get())
-    {
-        problem("DVDPerfectThread could not open the title's info file");
-        return false;
-    }
+    dvdRet = dvdnav_current_title_info(dvdnav, &curTitle, &curTitlePart);
+    sendLoggingEvent(QString("Now playing Title %1 - Part %2\n").arg(curTitle).arg(curTitlePart));
 
-    //
-    //  Determine the program chain (?)
-    //
-    int ttn = tt_srpt->title[title_number].vts_ttn;
-    vts_ptt_srpt_t *vts_ptt_srpt = vts_file->vts_ptt_srpt;
-    int pgc_id = vts_ptt_srpt->title[ ttn - 1 ].ptt[ 0 ].pgcn;
-    int pgn = vts_ptt_srpt->title[ ttn - 1 ].ptt[ 0 ].pgn;
-    pgc_t *cur_pgc = vts_file->vts_pgcit->pgci_srp[ pgc_id - 1 ].pgc;
-    int start_cell = cur_pgc->program_map[ pgn - 1 ] - 1;
+    finished = 0;
 
-
-    //
-    //  Hmmmm ... need some sort of total to calculate
-    //  progress display against .... I guess disc
-    //  sectors will have to do .... 
-    //
-
-    int total_sectors = 0;
-
-    for(int i = start_cell; i < cur_pgc->nr_of_cells; i++)
+    while (!finished)
     {
-        total_sectors += cur_pgc->cell_playback[i].last_sector -
-                         cur_pgc->cell_playback[i].first_sector;
-    }
+        blockBuf = packetBuf;
+        dvdRet = dvdnav_get_next_cache_block(dvdnav, &blockBuf, &event, &len);
+        if (dvdRet == DVDNAV_STATUS_ERR)
+        {
+            problem(QString("Error Getting Next Block (%1)\n").arg(dvdnav_err_to_string(dvdnav)));
+            dvdnav_free_cache_block(dvdnav, blockBuf);
+            dvdnav_close(dvdnav);
+            return false;
+        }
 
-    //
-    //  OK ... now actually open
-    //    
-    
-    SmartHandle<dvd_file_t *> title(
-            DVDOpenFile(the_dvd.get(),
-                    tt_srpt->title[title_number].title_set_nr,
-                    DVD_READ_TITLE_VOBS),
-            DVDCloseFile);
-    if(!title.get())
-    {
-        problem("DVDPerfectThread could not open the title's actual VOB(s)");
-        return false;
-    }
-    
-    int sector_counter = 0;
-
-    QTime job_time;
-    job_time.start();
-
-    std::vector<unsigned char> video_data(1024 * DVD_VIDEO_LB_LEN);
-    
-    int next_cell = start_cell;    
-    for(int cur_cell = start_cell; next_cell < cur_pgc->nr_of_cells; )
-    {
-        cur_cell = next_cell;
-        if(cur_pgc->cell_playback[ cur_cell ].block_type == BLOCK_TYPE_ANGLE_BLOCK)
+        switch(event)
         {
-            
-            cur_cell += angle;
-            for(int i=0;; ++i)
+            case DVDNAV_BLOCK_OK:
             {
-                if(cur_pgc->cell_playback[ cur_cell + i ].block_mode == BLOCK_MODE_LAST_CELL)
+                updateSubjobString(job_time.elapsed() / 1000,
+                                   QObject::tr("Ripping to file ~"));
+                if(!ripfile.writeBlocks(blockBuf,
+                                len))
                 {
-                    next_cell = cur_cell + i + 1;
-                    break;
+                    problem("Couldn't write blocks during a rip. Filesystem size exceeded? Disc full?");
+                    dvdnav_free_cache_block(dvdnav, blockBuf);
+                    dvdnav_close(dvdnav);
+                    return false;
                 }
-             }
-         }
-         else
-         {
-            next_cell = cur_cell + 1;
-         }
-
-         //
-         // Loop until we're out of this cell
-         //
-         
-         for(uint cur_pack = cur_pgc->cell_playback[ cur_cell ].first_sector;
-                  cur_pack < cur_pgc->cell_playback[ cur_cell ].last_sector; )
-         {
-            dsi_t dsi_pack;
-            unsigned int next_vobu, next_ilvu_start, cur_output_size;
-                        
-            //
-            //  Read the NAV packet.
-            //            
-            
-            int len = DVDReadBlocks(title.get(), (int) cur_pack, 1, 
-                                    &video_data[0]);
-            if( len != 1)
+                break;
+            }
+            case DVDNAV_STILL_FRAME:
             {
-                problem(QString("DVDPerfectThread read failed for block %1")
-                        .arg(cur_pack));
-                return false;
+                sendLoggingEvent("Skipping still frame\n");
+                dvdnav_still_skip(dvdnav);
+                break;
             }
-            
-            //
-            //  libdvdread example code has an assertion here
-            //
-            //        assert( is_nav_pack( video_data ) );
-            
-            //
-            //  Parse the contained dsi packet
-            //
-            
-            navRead_DSI(&dsi_pack, &video_data[DSI_START_BYTE]);
-            //  and another assertion here: assert( cur_pack == dsi_pack.dsi_gi.nv_pck_lbn );
-            
-            //
-            //  Figure out where to go next
-            //
-            
-            next_ilvu_start = cur_pack+ dsi_pack.sml_agli.data[ angle ].address;
-            cur_output_size = dsi_pack.dsi_gi.vobu_ea;
-
-            if(dsi_pack.vobu_sri.next_vobu != SRI_END_OF_CELL )
+            case DVDNAV_STOP:
             {
-                next_vobu = cur_pack + ( dsi_pack.vobu_sri.next_vobu & 0x7fffffff );
+                finished = 1;
+                break;
             }
-            else
+            case DVDNAV_WAIT:
             {
-                next_vobu = cur_pack + cur_output_size + 1;
-            }            
-            
-            //  another assert:  assert( cur_output_size < 1024 );
-            cur_pack++;
-            sector_counter++;
+                dvdnav_wait_skip(dvdnav);
+                break;
+            }
+            case DVDNAV_CELL_CHANGE:
+            {
+                prevTitle     = curTitle;
+                prevTitlePart = curTitlePart;
+                dvdRet = dvdnav_current_title_info(dvdnav, &curTitle, &curTitlePart);
 
-            //
-            //  Read in and output cursize packs
-            //
-            
-            len = DVDReadBlocks(title.get(), (int)cur_pack, cur_output_size,
-                                &video_data[0]);
-            if( len != (int) cur_output_size )
+                setSubProgress((double) (curTitlePart) / (double) (titleParts), 1);
+                overall_progress = subjob_progress * sub_to_overall_multiple;
+                sendLoggingEvent(QString("Percent Complete: %1 (%2/%3)").arg(subjob_progress).arg(curTitlePart).arg(titleParts));
+
+                if (prevTitle != curTitle || prevTitlePart != curTitlePart)
+                    sendLoggingEvent(QString("Now playing Title %1 - Part %2\n").arg(curTitle).arg(curTitlePart));
+                break;
+            }
+            case DVDNAV_VTS_CHANGE:
             {
-                problem(QString("DVDPerfectThread read failed for %1 blocks at %2") 
-                        .arg(cur_output_size)
-                        .arg(cur_pack)
-                       );
-                return false;
+                prevTitle     = curTitle;
+                prevTitlePart = curTitlePart;
+                dvdRet = dvdnav_current_title_info(dvdnav, &curTitle, &curTitlePart);
+
+                if (prevTitle != curTitle || prevTitlePart != curTitlePart)
+                    sendLoggingEvent(QString("Now playing Title %1 - Part %2\n").arg(curTitle).arg(curTitlePart));
+                if (curTitle == 0 || curTitlePart == 0)
+                    finished = 1;
+
+                break;
             }
-            
-            setSubProgress((double) (sector_counter) / (double) (total_sectors), 1);
-            overall_progress = subjob_progress * sub_to_overall_multiple;
-            updateSubjobString(job_time.elapsed() / 1000, 
-                               QObject::tr("Ripping to file ~"));
-            if(!ripfile.writeBlocks(&video_data[0],
-                            cur_output_size * DVD_VIDEO_LB_LEN))
+            case DVDNAV_NOP:
             {
-                problem("Couldn't write blocks during a rip. Filesystem size exceeded? Disc full?");
-                return false;
+                break;
             }
+            default:
+            {
+                // sendLoggingEvent(QString("Unhandled event (%i)\n").arg(event));
+                break;
+            }
 
-            sector_counter += next_vobu - cur_pack;
-            cur_pack = next_vobu;
-
-
             //
             //  Escape out and clean up if mtd main thread
             //  tells us to
             //
-            
+
             if(!keepGoing())
             {
                 problem("abandoned job because master control said we need to shut down");
+                dvdnav_free_cache_block(dvdnav, blockBuf);
+                dvdnav_close(dvdnav);
                 return false;
             }
         }
     }
+    dvdnav_free_cache_block(dvdnav, blockBuf);
+    dvdnav_close(dvdnav);
 
     //
     //  Wow, we're done.

dvdprobe.h

@@ -23 +23 @@
 #include <mythtv/dvdnav/ifo_read.h>
 #include <mythtv/dvdnav/dvd_reader.h>
 #include <mythtv/dvdnav/nav_read.h>
+#include <mythtv/dvdnav/dvdnav.h>
+#include <mythtv/dvdnav/dvdnav_events.h>
 
 #ifdef MAXDEFS
 #undef UINT8_MAX