+ 64 bit fix for ffmpeg built externally (should switch to pkg-config here)

[melted] / src / modules / avformat / consumer_avformat.c

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index 81e6906..612e88b 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -331,6 +331,9 @@ static AVStream *add_audio_stream( mlt_consumer this, AVFormatContext *oc, int c
                c->sample_rate = mlt_properties_get_int( properties, "frequency" );
                c->channels = mlt_properties_get_int( properties, "channels" );
 
+       if (oc->oformat->flags & AVFMT_GLOBALHEADER) 
+               c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+
                // Allow the user to override the audio fourcc
                if ( mlt_properties_get( properties, "afourcc" ) )
                {
@@ -418,6 +421,8 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
 
        if ( st != NULL ) 
        {
+               char *pix_fmt = mlt_properties_get( properties, "pix_fmt" );
+               double ar = mlt_properties_get_double( properties, "display_ratio" );
                AVCodecContext *c = st->codec;
                c->codec_id = codec_id;
                c->codec_type = CODEC_TYPE_VIDEO;
@@ -430,7 +435,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
                c->time_base.num = mlt_properties_get_int( properties, "frame_rate_den" );
                c->time_base.den = mlt_properties_get_int( properties, "frame_rate_num" );
                c->gop_size = mlt_properties_get_int( properties, "gop_size" );
-               c->pix_fmt = PIX_FMT_YUV420P;
+               c->pix_fmt = pix_fmt ? avcodec_get_pix_fmt( pix_fmt ) : PIX_FMT_YUV420P;
 
                if ( mlt_properties_get_int( properties, "b_frames" ) )
                {
@@ -440,8 +445,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
                }
 
                c->mb_decision = mlt_properties_get_int( properties, "mb_decision" );
-               c->sample_aspect_ratio.den = mlt_properties_get_double( properties, "aspect_ratio_den" );
-               c->sample_aspect_ratio.num = mlt_properties_get_double( properties, "aspect_ratio_num" );
+               c->sample_aspect_ratio = av_d2q( ar * c->height / c->width , 255);
                c->mb_cmp = mlt_properties_get_int( properties, "mb_cmp" );
                c->ildct_cmp = mlt_properties_get_int( properties, "ildct_cmp" );
                c->me_sub_cmp = mlt_properties_get_int( properties, "sub_cmp" );
@@ -801,7 +805,7 @@ static void *consumer_thread( void *arg )
                        // Get audio and append to the fifo
                        if ( !terminated && audio_st )
                        {
-                               samples = mlt_sample_calculator( fps, frequency, count );
+                               samples = mlt_sample_calculator( fps, frequency, count ++ );
                                mlt_frame_get_audio( frame, &pcm, &aud_fmt, &frequency, &channels, &samples );
 
                                // Create the fifo if we don't have one
@@ -854,14 +858,15 @@ static void *consumer_thread( void *arg )
 
                                        pkt.size = avcodec_encode_audio( c, audio_outbuf, audio_outbuf_size, buffer );
                                        // Write the compressed frame in the media file
-                                       if ( c->coded_frame )
+                                       if ( c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE )
                                                pkt.pts = av_rescale_q( c->coded_frame->pts, c->time_base, audio_st->time_base );
                                        pkt.flags |= PKT_FLAG_KEY;
                                        pkt.stream_index= audio_st->index;
                                        pkt.data= audio_outbuf;
 
-                                       if ( av_interleaved_write_frame( oc, &pkt ) != 0) 
-                                               fprintf(stderr, "Error while writing audio frame\n");
+                                       if ( pkt.size )
+                                               if ( av_interleaved_write_frame( oc, &pkt ) != 0) 
+                                                       fprintf(stderr, "Error while writing audio frame\n");
 
                                        audio_pts += c->frame_size;
                                }
@@ -891,17 +896,11 @@ static void *consumer_thread( void *arg )
 
                                                mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
 
-                                               // This will cause some fx to go awry....
-                                               if ( mlt_properties_get_int( properties, "transcode" ) )
-                                               {
-                                                       mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "normalised_width", img_height * 4.0 / 3.0 );
-                                                       mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "normalised_height", img_height );
-                                               }
-
                                                mlt_frame_get_image( frame, &image, &img_fmt, &img_width, &img_height, 0 );
 
                                                q = image;
 
+                                               // Convert the mlt frame to an AVPicture
                                                for ( i = 0; i < height; i ++ )
                                                {
                                                        p = input->data[ 0 ] + i * input->linesize[ 0 ];
@@ -913,7 +912,39 @@ static void *consumer_thread( void *arg )
                                                        }
                                                }
 
+                                               // Do the colour space conversion
                                                img_convert( ( AVPicture * )output, video_st->codec->pix_fmt, ( AVPicture * )input, PIX_FMT_YUV422, width, height );
+
+                                               // Apply the alpha if applicable
+                                               if ( video_st->codec->pix_fmt == PIX_FMT_RGBA32 )
+                                               {
+                                                       uint8_t *alpha = mlt_frame_get_alpha_mask( frame );
+                                                       register int n;
+
+                                                       for ( i = 0; i < height; i ++ )
+                                                       {
+                                                               n = ( width + 7 ) / 8;
+                                                               p = output->data[ 0 ] + i * output->linesize[ 0 ];
+
+                                                               #ifndef __DARWIN__
+                                                               p += 3;
+                                                               #endif
+
+                                                               switch( width % 8 )
+                                                               {
+                                                                       case 0: do { *p = *alpha++; p += 4;
+                                                                       case 7:          *p = *alpha++; p += 4;
+                                                                       case 6:          *p = *alpha++; p += 4;
+                                                                       case 5:          *p = *alpha++; p += 4;
+                                                                       case 4:          *p = *alpha++; p += 4;
+                                                                       case 3:          *p = *alpha++; p += 4;
+                                                                       case 2:          *p = *alpha++; p += 4;
+                                                                       case 1:          *p = *alpha++; p += 4;
+                                                                                       }
+                                                                                       while( --n );
+                                                               }
+                                                       }
+                                               }
                                        }
  
                                        if (oc->oformat->flags & AVFMT_RAWPICTURE) 
@@ -939,12 +970,12 @@ static void *consumer_thread( void *arg )
                                                out_size = avcodec_encode_video(c, video_outbuf, video_outbuf_size, output );
 
                                                // If zero size, it means the image was buffered
-                                               if (out_size != 0) 
+                                               if (out_size > 0) 
                                                {
                                                        AVPacket pkt;
                                                        av_init_packet( &pkt );
 
-                                                       if ( c->coded_frame )
+                                                       if ( c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE )
                                                                pkt.pts= av_rescale_q( c->coded_frame->pts, c->time_base, video_st->time_base );
                                                        if( c->coded_frame && c->coded_frame->key_frame )
                                                                pkt.flags |= PKT_FLAG_KEY;
@@ -956,6 +987,10 @@ static void *consumer_thread( void *arg )
                                                        ret = av_interleaved_write_frame(oc, &pkt);
                                                        video_pts += c->frame_size;
                                                } 
+                                               else
+                                               {
+                                                       fprintf( stderr, "Error with video encode\n" );
+                                               }
                                        }
                                        frame_count++;
                                        mlt_frame_close( frame );