[Avidemux-svn-commit] r3685 - branches/avidemux_2.4_branch/avidemux

[mean at BerliOS]

Author: mean
Date: 2007-11-08 19:37:49 +0100 (Thu, 08 Nov 2007)
New Revision: 3685

Modified:
   branches/avidemux_2.4_branch/avidemux/gui_navigate.cpp
Log:
[UI] Repair scan for all black frames too

Modified: branches/avidemux_2.4_branch/avidemux/gui_navigate.cpp
===================================================================
--- branches/avidemux_2.4_branch/avidemux/gui_navigate.cpp	2007-11-08 18:23:57 UTC (rev 3684)
+++ branches/avidemux_2.4_branch/avidemux/gui_navigate.cpp	2007-11-08 18:37:49 UTC (rev 3685)
@@ -278,12 +278,12 @@
 
    return ;
 }
+/**
+    \fn A_ListAllBlackFrames
+    \brief Scan for all black frames and output that in a separate (text) file
+*/
 uint8_t A_ListAllBlackFrames(char *name)
 {
-  return 0;
-#if 0
-// Print a list of all black frames
-//_____________________________________________________________
     uint32_t f;
     uint32_t flags;
     uint32_t startframe;
@@ -300,7 +300,8 @@
         return 0;
     if ( !avifileinfo )
         return 0;
-
+   ADMImage *buffer=admPreview::getBuffer();
+    if(!buffer) return 0;
    
     if ( !outfile )
         return 0;
@@ -320,14 +321,14 @@
     for (f=0; f<avifileinfo->nb_frames; f++) {
        if( work->update( 100 * f / avifileinfo->nb_frames ) ) 
             break;
-        if ( !video_body->getUncompressedFrame(f,rdr_decomp_buffer,&flags) ) {
-            curframe=0;
-            video_body->getUncompressedFrame(0,rdr_decomp_buffer);
+        if ( !video_body->getUncompressedFrame(f,buffer,&flags) ) 
+        {
             break;
         }
 
         curframe=f;
-        if ( !fastIsNotBlack(darkness) ) {
+        if ( !fastIsNotBlack(darkness,buffer) ) 
+        {
             frame2time(curframe,avifileinfo->fps1000,&hh,&mm,&ss,&ms);
             printf("\tBlack frame: frame %d  time %02d:%02d:%02d.%03d\n", curframe, hh, mm, ss, ms);
             fprintf(fd, "\tBlack frame: frame %d  time %02d:%02d:%02d.%03d\n", curframe, hh, mm, ss, ms);
@@ -335,7 +336,7 @@
         reresh_count++;
         if(reresh_count>100)
         {
-                update_status_bar(rdr_decomp_buffer);
+                update_status_bar();
                 reresh_count=0;
         }
     }
@@ -343,16 +344,8 @@
     printf("** done **\n\n");
     fclose(fd);
     delete work;
-    curframe=startframe;
-    if ( !video_body->getUncompressedFrame(curframe,rdr_decomp_buffer,&flags) ) {
-        curframe=0;
-        video_body->getUncompressedFrame(0,rdr_decomp_buffer);
-    }
-     admPreview::update( curframe,rdr_decomp_buffer) ;
-     update_status_bar(rdr_decomp_buffer);
-
+    GUI_GoToFrame(startframe);
     return 1;
-#endif
 }
 //**********************************************************************