add support for ffmpeg libswscale

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

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index dfa1c6b..3348755 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -35,6 +35,9 @@
 
 // avformat header files
 #include <avformat.h>
+#ifdef SWSCALE
+#include <swscale.h>
+#endif
 
 //
 // This structure should be extended and made globally available in mlt
@@ -161,7 +164,7 @@ mlt_consumer consumer_avformat_init( char *arg )
                mlt_properties_set_int( properties, "gop_size", 12 );
                mlt_properties_set_int( properties, "b_frames", 0 );
                mlt_properties_set_int( properties, "mb_decision", FF_MB_DECISION_SIMPLE );
-               mlt_properties_set_double( properties, "qscale", 0 );
+               mlt_properties_set_double( properties, "qscale", 1 );
                mlt_properties_set_int( properties, "me_method", ME_EPZS );
                mlt_properties_set_int( properties, "mb_cmp", FF_CMP_SAD );
                mlt_properties_set_int( properties, "ildct_cmp", FF_CMP_VSAD );
@@ -331,6 +334,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" ) )
                {
@@ -733,6 +739,32 @@ static void *consumer_thread( void *arg )
        }
 
        // Update the output context
+
+       // Write metadata
+       char *tmp = NULL;
+       int metavalue;
+
+       tmp = mlt_properties_get( properties, "meta.attr.title.markup");
+       if (tmp != NULL) snprintf( oc->title, sizeof(oc->title), "%s", tmp );
+
+       tmp = mlt_properties_get( properties, "meta.attr.comment.markup");
+       if (tmp != NULL) snprintf( oc->comment, sizeof(oc->comment), "%s", tmp );
+
+       tmp = mlt_properties_get( properties, "meta.attr.author.markup");
+       if (tmp != NULL) snprintf( oc->author, sizeof(oc->author), "%s", tmp );
+
+       tmp = mlt_properties_get( properties, "meta.attr.copyright.markup");
+       if (tmp != NULL) snprintf( oc->copyright, sizeof(oc->copyright), "%s", tmp );
+
+       tmp = mlt_properties_get( properties, "meta.attr.album.markup");
+       if (tmp != NULL) snprintf( oc->album, sizeof(oc->album), "%s", tmp );
+
+       metavalue = mlt_properties_get_int( properties, "meta.attr.year.markup");
+       if (metavalue != 0) oc->year = metavalue;
+
+       metavalue = mlt_properties_get_int( properties, "meta.attr.track.markup");
+       if (metavalue != 0) oc->track = metavalue;
+
        oc->oformat = fmt;
        snprintf( oc->filename, sizeof(oc->filename), "%s", filename );
 
@@ -802,7 +834,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
@@ -855,14 +887,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;
                                }
@@ -909,7 +942,15 @@ static void *consumer_thread( void *arg )
                                                }
 
                                                // Do the colour space conversion
+#ifdef SWSCALE
+                                               struct SwsContext *context = sws_getContext( width, height, PIX_FMT_YUV422,
+                                                       width, height, video_st->codec->pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+                                               sws_scale( context, input->data, input->linesize, 0, height,
+                                                       output->data, output->linesize);
+                                               sws_freeContext( context );
+#else
                                                img_convert( ( AVPicture * )output, video_st->codec->pix_fmt, ( AVPicture * )input, PIX_FMT_YUV422, width, height );
+#endif
 
                                                // Apply the alpha if applicable
                                                if ( video_st->codec->pix_fmt == PIX_FMT_RGBA32 )
@@ -966,12 +1007,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;
@@ -983,6 +1024,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 );