OSDN Git Service

Variable frame rate improvements.
[handbrake-jp/handbrake-jp-git.git] / libhb / hb.c
index a956e95..9f1b6be 100644 (file)
@@ -1,6 +1,7 @@
 #include "hb.h"
 
 #include "ffmpeg/avcodec.h"
+#include "ffmpeg/swscale.h"
 
 struct hb_handle_s
 {
@@ -22,6 +23,7 @@ struct hb_handle_s
     /* The thread which processes the jobs. Others threads are launched
        from this one (see work.c) */
     hb_list_t    * jobs;
+    hb_job_t     * current_job;
     int            job_count;
     int            job_count_permanent;
     volatile int   work_die;
@@ -102,6 +104,11 @@ hb_handle_t * hb_init_real( int verbose, int update_check )
         }
     }
 
+    /*
+     * Initialise buffer pool
+     */
+    hb_buffer_pool_init();
+
     /* CPU count detection */
     hb_log( "hb_init: checking cpu count" );
     h->cpu_count = hb_get_cpu_count();
@@ -116,9 +123,7 @@ hb_handle_t * hb_init_real( int verbose, int update_check )
 
     /* libavcodec */
     avcodec_init();
-    register_avcodec( &mpeg4_encoder );
-    register_avcodec( &mp2_decoder );
-    register_avcodec( &ac3_encoder );
+    avcodec_register_all();
     av_register_codec_parser( &mpegaudio_parser);
     
     /* Start library thread */
@@ -187,6 +192,7 @@ hb_handle_t * hb_init_dl( int verbose, int update_check )
 
     h->list_title = hb_list_init();
     h->jobs       = hb_list_init();
+    h->current_job = NULL;
 
     h->state_lock  = hb_lock_init();
     h->state.state = HB_STATE_IDLE;
@@ -195,9 +201,7 @@ hb_handle_t * hb_init_dl( int verbose, int update_check )
 
     /* libavcodec */
     avcodec_init();
-    register_avcodec( &mpeg4_encoder );
-    register_avcodec( &mp2_decoder );
-    register_avcodec( &ac3_encoder );
+    avcodec_register_all();
 
     /* Start library thread */
     hb_log( "hb_init: starting libhb thread" );
@@ -314,23 +318,25 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture,
     FILE               * file;
     uint8_t            * buf1, * buf2, * buf3, * buf4, * pen;
     uint32_t           * p32;
-    AVPicture            pic1, pic2, pic3, pic4;
-    ImgReSampleContext * context;
+    AVPicture            pic_in, pic_preview, pic_deint, pic_crop, pic_scale;
+    struct SwsContext  * context;
     int                  i;
 
     buf1 = malloc( title->width * title->height * 3 / 2 );
     buf2 = malloc( title->width * title->height * 3 / 2 );
     buf3 = malloc( title->width * title->height * 3 / 2 );
     buf4 = malloc( title->width * title->height * 4 );
-    avpicture_fill( &pic1, buf1, PIX_FMT_YUV420P,
+    avpicture_fill( &pic_in, buf1, PIX_FMT_YUV420P,
                     title->width, title->height );
-    avpicture_fill( &pic2, buf2, PIX_FMT_YUV420P,
+    avpicture_fill( &pic_deint, buf2, PIX_FMT_YUV420P,
                     title->width, title->height );
-    avpicture_fill( &pic3, buf3, PIX_FMT_YUV420P,
+    avpicture_fill( &pic_scale, buf3, PIX_FMT_YUV420P,
                     job->width, job->height );
-    avpicture_fill( &pic4, buf4, PIX_FMT_RGBA32,
+    avpicture_fill( &pic_preview, buf4, PIX_FMT_RGBA32,
                     job->width, job->height );
-    
+
+    // Allocate the AVPicture frames and fill in
+
     memset( filename, 0, 1024 );
 
     hb_get_tempory_filename( h, filename, "%x%d",
@@ -346,23 +352,47 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture,
     fread( buf1, title->width * title->height * 3 / 2, 1, file );
     fclose( file );
 
-    context = img_resample_full_init(
-            job->width, job->height, title->width, title->height,
-            job->crop[0], job->crop[1], job->crop[2], job->crop[3],
-            0, 0, 0, 0 );
-
     if( job->deinterlace )
     {
-        avpicture_deinterlace( &pic2, &pic1, PIX_FMT_YUV420P,
-                               title->width, title->height );
-        img_resample( context, &pic3, &pic2 );
+        // Deinterlace and crop
+        avpicture_deinterlace( &pic_deint, &pic_in, PIX_FMT_YUV420P, title->width, title->height );
+        av_picture_crop( &pic_crop, &pic_deint, PIX_FMT_YUV420P, job->crop[0], job->crop[2] );
     }
     else
     {
-        img_resample( context, &pic3, &pic1 );
+        // Crop
+        av_picture_crop( &pic_crop, &pic_in, PIX_FMT_YUV420P, job->crop[0], job->crop[2] );
     }
-    img_convert( &pic4, PIX_FMT_RGBA32, &pic3, PIX_FMT_YUV420P,
-                 job->width, job->height );
+
+    // Get scaling context
+    context = sws_getContext(title->width  - (job->crop[2] + job->crop[3]),
+                             title->height - (job->crop[0] + job->crop[1]),
+                             PIX_FMT_YUV420P,
+                             job->width, job->height, PIX_FMT_YUV420P,
+                             (uint16_t)(SWS_LANCZOS|SWS_ACCURATE_RND), NULL, NULL, NULL);
+
+    // Scale
+    sws_scale(context,
+              pic_crop.data, pic_crop.linesize,
+              0, title->height - (job->crop[0] + job->crop[1]),
+              pic_scale.data, pic_scale.linesize);
+
+    // Free context
+    sws_freeContext( context );
+
+    // Get preview context
+    context = sws_getContext(job->width, job->height, PIX_FMT_YUV420P,
+                             job->width, job->height, PIX_FMT_RGBA32,
+                             (uint16_t)(SWS_LANCZOS|SWS_ACCURATE_RND), NULL, NULL, NULL);
+
+    // Create preview
+    sws_scale(context,
+              pic_scale.data, pic_scale.linesize,
+              0, job->height,
+              pic_preview.data, pic_preview.linesize);
+
+    // Free context
+    sws_freeContext( context );
 
     /* Gray background */
     p32 = (uint32_t *) buffer;
@@ -389,10 +419,182 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture,
     }
     memset( pen, 0xFF, 4 * ( job->width + 2 ) );
 
-    free( buf1 );
-    free( buf2 );
-    free( buf3 );
-    free( buf4 );
+    // Clean up
+    avpicture_free( &pic_preview );
+    avpicture_free( &pic_scale );
+    avpicture_free( &pic_deint );
+    avpicture_free( &pic_in );
+}
+
+/**
+ * Calculates job width and height for anamorphic content,
+ *
+ * @param job Handle to hb_job_t
+ * @param output_width Pointer to returned storage width
+ * @param output_height Pointer to returned storage height
+ * @param output_par_width Pointer to returned pixel width
+ @ param output_par_height Pointer to returned pixel height
+ */
+void hb_set_anamorphic_size( hb_job_t * job,
+        int *output_width, int *output_height,
+        int *output_par_width, int *output_par_height )
+{
+    /* "Loose" anamorphic.
+        - Uses mod16-compliant dimensions,
+        - Allows users to set the width
+        - Handles ITU pixel aspects
+    */
+    
+    /* Set up some variables to make the math easier to follow. */
+    hb_title_t * title = job->title;
+    int cropped_width = title->width - job->crop[2] - job->crop[3] ;
+    int cropped_height = title->height - job->crop[0] - job->crop[1] ;
+    int storage_aspect = cropped_width * 10000 / cropped_height;        
+    int width = job->width;
+    int height; // Gets set later, ignore user value
+    int mod = job->modulus;
+    int aspect = title->aspect;
+
+    /* Gotta handle bounding dimensions differently
+       than for non-anamorphic encodes:
+       If the width is too big, just reset it with no rescaling.
+       Instead of using the aspect-scaled job height,
+       we need to see if the job width divided by the storage aspect
+       is bigger than the max. If so, set it to the max (this is sloppy).
+       If not, set job height to job width divided by storage aspect.
+    */
+    
+    if ( job->maxWidth && (job->maxWidth < job->width) )
+            width = job->maxWidth;
+    
+    if ( job->maxHeight && (job->maxHeight < (width / storage_aspect * 10000)) )
+    {
+        height = job->maxHeight;
+    }
+    else
+    {
+        height = width * 10000 / storage_aspect;
+    }
+        
+        
+    /* Time to get picture dimensions that divide cleanly.
+       These variables will store temporary dimensions as we iterate. */
+    int i, w, h;
+
+    /* In case the user specified a modulus, use it */
+    if (job->modulus)
+        mod = job->modulus;
+    else
+        mod = 16;
+        
+    /* Iterate through multiples of mod to find one close to job->width. */
+    for( i = 1;; i++ )
+    {
+        w = mod * i;
+        
+        if (w < width)
+        {
+            if ( ( width - w ) <= ( mod / 2 ) )
+                /* We'll take a width that's
+                   smaller, but close enough. */
+                break;
+        }
+        if (w == width)
+            /* Mod 16 dimensions, how nice! */
+            break;
+        if( w > width )
+        {
+            if ( ( w - width ) < (mod/2) )
+                /* We'll take a width that's bigger, if we have to. */
+                break;
+        }
+    }
+    width  = mod * (i);
+    
+    /* Now do the same for a mod-friendly value near job->height. */
+    for( i = 1;; i++)
+    {
+        h = i * mod;
+        
+        if (h < height)
+            {
+                if ( ( height - h ) <= ( mod / 2 ))
+                    /* Go with a smaller height,
+                       if it's close enough.    */
+                    break;
+            }
+        if (h == height)
+            /* Mod 16 dimensions, how nice! */
+            break;
+            
+        if ( h > height)
+        {
+            if ( ( h - height ) < ( mod / 2 ))
+                /* Use a taller height if necessary */
+                break;
+        }
+    }
+    height = mod  * (i);
+    
+    int pixel_aspect_width = job->pixel_aspect_width;
+    int pixel_aspect_height = job->pixel_aspect_height;
+    
+    if (cropped_width <= 706)
+    {
+        /* Handle ITU PARs */
+        if (title->height == 480)
+        {
+            /* It's NTSC */
+            if (aspect == 16)
+            {
+                /* It's widescreen */
+                pixel_aspect_width = 40;
+                pixel_aspect_height = 33;
+            }
+            else
+            {
+                /* It's 4:3 */
+                pixel_aspect_width = 10;
+                pixel_aspect_height = 11;
+            }
+        }
+        else if (title->height == 576)
+        {
+            /* It's PAL */
+            if(aspect == 16)
+            {
+                /* It's widescreen */
+                pixel_aspect_width = 16;
+                pixel_aspect_height = 11;
+            }
+            else
+            {
+                /* It's 4:3 */
+                pixel_aspect_width = 12;
+                pixel_aspect_height = 11;
+            }
+        }
+    }
+
+    /* Figure out what dimensions the source would display at. */
+    int source_display_width = cropped_width * ((float)pixel_aspect_width / (float)pixel_aspect_height) ;
+   
+    /* The film AR is the source's display width / cropped source height.
+       The output display width is the output height * film AR.
+       The output PAR is the output display width / output storage width. */
+    pixel_aspect_width = height * source_display_width / cropped_height;
+    pixel_aspect_height = width;
+    
+    /* While x264 is smart enough to reduce fractions on its own, libavcodec
+       needs some help with the math, so lose superfluous factors.            */
+    hb_reduce( &pixel_aspect_width, &pixel_aspect_height,
+               pixel_aspect_width, pixel_aspect_height );
+    
+    /* Pass the results back to the caller */
+    *output_width = width;
+    *output_height = height;
+    *output_par_width = pixel_aspect_width;
+    *output_par_height = pixel_aspect_height;
 }
 
 /**
@@ -505,6 +707,11 @@ hb_job_t * hb_job( hb_handle_t * h, int i )
     return hb_list_item( h->jobs, i );
 }
 
+hb_job_t * hb_current_job( hb_handle_t * h )
+{
+    return( h->current_job );
+}
+
 /**
  * Adds a job to the job list.
  * @param h Handle to hb_handle_t.
@@ -538,7 +745,7 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
     title_copy->list_audio = hb_list_init();
 
     /* Do nothing about audio during first pass */
-    if( job->pass != 1 )
+    if( job->pass == 0 || job->pass == 2 )
     {
         for( i = 0; i < 8; i++ )
         {
@@ -557,10 +764,26 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
 
     title_copy->list_subtitle = hb_list_init();
 
-
+    /*
+     * The following code is confusing, there are three ways in which
+     * we select subtitles and it depends on whether this is single or
+     * two pass mode.
+     *
+     * subtitle_scan may be enabled, in which case the first pass
+     * scans all subtitles of that language. The second pass does not
+     * select any because they are set at the end of the first pass.
+     *
+     * native_language may have a preferred language, in which case we
+     * may be switching the language we want for the subtitles in the
+     * first pass of a single pass, or the second pass of a two pass.
+     *
+     * We may have manually selected a subtitle, in which case that is
+     * selected in the first pass of a single pass, or the second of a
+     * two pass.
+     */
     memset( audio_lang, 0, sizeof( audio_lang ) );
 
-    if ( job->subtitle_scan || job->native_language ) {
+    if ( job->indepth_scan || job->native_language ) {
       
         /*
          * Find the first audio language that is being encoded
@@ -578,15 +801,21 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
             }
         }
 
-        
+        /*
+         * In all cases switch the language if we need to to our native
+         * language.
+         */
         if( job->native_language ) 
         {
             if( strncasecmp( job->native_language, audio_lang, 
                              sizeof( audio_lang ) ) != 0 )
             {             
                 
-                hb_log( "Enabled subtitles in native language '%s', audio is in '%s'",
-                        job->native_language, audio_lang);
+                if( job->pass != 2 )
+                {
+                    hb_log( "Enabled subtitles in native language '%s', audio is in '%s'",
+                            job->native_language, audio_lang);
+                }
                 /*
                  * The main audio track is not in our native language, so switch
                  * the subtitles to use our native language instead.
@@ -601,12 +830,13 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
             }
         }
     }
-    
-    if ( job->subtitle_scan || job->native_language ) 
+
+    /*
+     * If doing a subtitle scan then add all the matching subtitles for this
+     * language.
+     */
+    if ( job->indepth_scan ) 
     {
-        /*
-         * Select subtitles that match the language we want
-         */
         for( i=0; i < hb_list_count( title->list_subtitle ); i++ ) 
         {
             subtitle = hb_list_item( title->list_subtitle, i );
@@ -615,15 +845,18 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
                 /*
                  * Matched subtitle language with audio language, so
                  * add this to our list to scan.
+                 *
+                 * We will update the subtitle list on the second pass
+                 * later after the first pass has completed.
                  */
                 subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
                 memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
                 hb_list_add( title_copy->list_subtitle, subtitle_copy );
-                if ( !job->subtitle_scan ) {
+                if ( job->native_language ) {
                     /*
                      * With native language just select the
                      * first match in our langiage, not all of
-                     * them.
+                     * them. Subsequent ones are likely to be commentary
                      */
                     break;
                 }
@@ -631,16 +864,56 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
         }
     } else {
         /*
-         * Manually selected subtitle, in which case only bother adding them
-         * for pass 0 or pass 2 of a two pass.
+         * Not doing a subtitle scan in this pass, but maybe we are in the
+         * first pass?
          */
-        if( job->pass != 1 ) 
+        if( job->select_subtitle )
         {
-            if( ( subtitle = hb_list_item( title->list_subtitle, job->subtitle ) ) )
+            /*
+             * Don't add subtitles here, we'll add them via select_subtitle
+             * at the end of the subtitle_scan.
+             */
+        } else {
+            /*
+             * Definitely not doing a subtitle scan.
+             */
+            if( job->pass != 1 && job->native_language ) 
             {
-                subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
-                memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
-                hb_list_add( title_copy->list_subtitle, subtitle_copy );
+                /*
+                 * We are not doing a subtitle scan but do want the
+                 * native langauge subtitle selected, so select it 
+                 * for pass 0 or pass 2 of a two pass.
+                 */
+                for( i=0; i < hb_list_count( title->list_subtitle ); i++ ) 
+                {
+                    subtitle = hb_list_item( title->list_subtitle, i );
+                    if( strcmp( subtitle->iso639_2, audio_lang ) == 0 ) 
+                    {
+                        /*
+                         * Matched subtitle language with audio language, so
+                         * add this to our list to scan.
+                         */
+                        subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
+                        memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
+                        hb_list_add( title_copy->list_subtitle, subtitle_copy );
+                        break;
+                    }
+                }
+            } else {
+                /*
+                 * Manually selected subtitle, in which case only
+                 * bother adding them for pass 0 or pass 2 of a two
+                 * pass.
+                 */
+                if( job->pass != 1 ) 
+                {
+                    if( ( subtitle = hb_list_item( title->list_subtitle, job->subtitle ) ) )
+                    {
+                        subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
+                        memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
+                        hb_list_add( title_copy->list_subtitle, subtitle_copy );
+                    }
+                }
             }
         }
     }
@@ -654,6 +927,33 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
     job_copy->h     = h;
     job_copy->pause = h->pause_lock;
 
+    /* Copy the job filter list */
+    if( job->filters )
+    {
+        int i;
+        int filter_count = hb_list_count( job->filters );
+        job_copy->filters = hb_list_init();        
+        for( i = 0; i < filter_count; i++ )
+        {
+            /*
+             * Copy the filters, since the MacGui reuses the global filter objects
+             * meaning that queued up jobs overwrite the previous filter settings.
+             * In reality, settings is probably the only field that needs duplicating
+             * since it's the only value that is ever changed. But name is duplicated
+             * as well for completeness. Not copying private_data since it gets
+             * created for each job in renderInit.
+             */
+            hb_filter_object_t * filter = hb_list_item( job->filters, i );
+            hb_filter_object_t * filter_copy = malloc( sizeof( hb_filter_object_t ) );
+            memcpy( filter_copy, filter, sizeof( hb_filter_object_t ) );
+            if( filter->name )
+                filter_copy->name = strdup( filter->name );
+            if( filter->settings )
+                filter_copy->settings = strdup( filter->settings );
+            hb_list_add( job_copy->filters, filter_copy );
+        }        
+    }
+    
     /* Add the job to the list */
     hb_list_add( h->jobs, job_copy );
     h->job_count = hb_count(h);
@@ -686,6 +986,7 @@ void hb_start( hb_handle_t * h )
 {
     /* XXX Hack */
     h->job_count = hb_list_count( h->jobs );
+    h->job_count_permanent = h->job_count;
 
     hb_lock( h->state_lock );
     h->state.state = HB_STATE_WORKING;
@@ -698,6 +999,7 @@ void hb_start( hb_handle_t * h )
     p.hours     = -1;
     p.minutes   = -1;
     p.seconds   = -1;
+    p.sequence_id = 0;
 #undef p
     hb_unlock( h->state_lock );
 
@@ -705,7 +1007,7 @@ void hb_start( hb_handle_t * h )
 
     h->work_die    = 0;
     h->work_thread = hb_work_init( h->jobs, h->cpu_count,
-                                   &h->work_die, &h->work_error );
+                                   &h->work_die, &h->work_error, &h->current_job );
 }
 
 /**
@@ -762,7 +1064,17 @@ void hb_get_state( hb_handle_t * h, hb_state_t * s )
     hb_lock( h->state_lock );
 
     memcpy( s, &h->state, sizeof( hb_state_t ) );
-    h->state.state = HB_STATE_IDLE;
+    if ( h->state.state == HB_STATE_SCANDONE || h->state.state == HB_STATE_WORKDONE )
+        h->state.state = HB_STATE_IDLE;
+
+    hb_unlock( h->state_lock );
+}
+
+void hb_get_state2( hb_handle_t * h, hb_state_t * s )
+{
+    hb_lock( h->state_lock );
+
+    memcpy( s, &h->state, sizeof( hb_state_t ) );
 
     hb_unlock( h->state_lock );
 }
@@ -791,6 +1103,10 @@ void hb_close( hb_handle_t ** _h )
     while( ( title = hb_list_item( h->list_title, 0 ) ) )
     {
         hb_list_rem( h->list_title, title );
+        if( title->job && title->job->filters )
+        {
+            hb_list_close( &title->job->filters );
+        }
         free( title->job );
         hb_title_close( &title );
     }
@@ -801,6 +1117,7 @@ void hb_close( hb_handle_t ** _h )
     hb_lock_close( &h->pause_lock );
     free( h );
     *_h = NULL;
+
 }
 
 /**
@@ -922,6 +1239,12 @@ void hb_set_state( hb_handle_t * h, hb_state_t * s )
         h->state.param.working.job_cur =
             h->job_count_permanent - hb_list_count( h->jobs );
         h->state.param.working.job_count = h->job_count_permanent;
+        
+        // Set which job is being worked on
+        if (h->current_job)
+            h->state.param.working.sequence_id = h->current_job->sequence_id;
+        else
+            h->state.param.working.sequence_id = 0;
     }
     hb_unlock( h->state_lock );
     hb_unlock( h->pause_lock );