X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconsumer_avformat.c;h=021c501889e8980a4b41b6bdec611e41a71383d5;hb=791bd9376050a663e68122d4feb841854805249c;hp=41febfccf547815f6837d1771913a727753d4e43;hpb=9b304e5ac1fbab3425088a96c72a652e39a0a260;p=melted diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c index 41febfc..021c501 100644 --- a/src/modules/avformat/consumer_avformat.c +++ b/src/modules/avformat/consumer_avformat.c @@ -35,17 +35,54 @@ // avformat header files #include +// +// This structure should be extended and made globally available in mlt +// + typedef struct { int16_t *buffer; int size; int used; + double time; + int frequency; + int channels; } *sample_fifo, sample_fifo_s; -sample_fifo sample_fifo_init( ) +sample_fifo sample_fifo_init( int frequency, int channels ) +{ + sample_fifo this = calloc( 1, sizeof( sample_fifo_s ) ); + this->frequency = frequency; + this->channels = channels; + return this; +} + +// sample_fifo_clear and check are temporarily aborted (not working as intended) + +void sample_fifo_clear( sample_fifo this, double time ) +{ + int words = ( float )( time - this->time ) * this->frequency * this->channels; + if ( ( int )( ( float )time * 100 ) < ( int )( ( float )this->time * 100 ) && this->used > words && words > 0 ) + { + memmove( this->buffer, &this->buffer[ words ], ( this->used - words ) * sizeof( int16_t ) ); + this->used -= words; + this->time = time; + } + else if ( ( int )( ( float )time * 100 ) != ( int )( ( float )this->time * 100 ) ) + { + this->used = 0; + this->time = time; + } +} + +void sample_fifo_check( sample_fifo this, double time ) { - return calloc( 1, sizeof( sample_fifo_s ) ); + if ( this->used == 0 ) + { + if ( ( int )( ( float )time * 100 ) < ( int )( ( float )this->time * 100 ) ) + this->time = time; + } } void sample_fifo_append( sample_fifo this, int16_t *samples, int count ) @@ -74,6 +111,8 @@ int sample_fifo_fetch( sample_fifo this, int16_t *samples, int count ) this->used -= count; memmove( this->buffer, &this->buffer[ count ], this->used * sizeof( int16_t ) ); + this->time += ( double )count / this->channels / this->frequency; + return count; } @@ -102,7 +141,7 @@ mlt_consumer consumer_avformat_init( char *arg ) if ( this != NULL ) { // Get properties from the consumer - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); // Assign close callback this->close = consumer_close; @@ -112,7 +151,6 @@ mlt_consumer consumer_avformat_init( char *arg ) mlt_properties_set( properties, "target", arg ); // sample and frame queue - mlt_properties_set_data( properties, "sample_fifo", sample_fifo_init( ), 0, ( mlt_destructor )sample_fifo_close, NULL ); mlt_properties_set_data( properties, "frame_queue", mlt_deque_init( ), 0, ( mlt_destructor )mlt_deque_close, NULL ); // Set avformat defaults (all lifted from ffmpeg.c) @@ -190,14 +228,13 @@ mlt_consumer consumer_avformat_init( char *arg ) static int consumer_start( mlt_consumer this ) { // Get the properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); // Check that we're not already running if ( !mlt_properties_get_int( properties, "running" ) ) { // Allocate a thread pthread_t *thread = calloc( 1, sizeof( pthread_t ) ); - pthread_attr_t thread_attributes; // Get the width and height int width = mlt_properties_get_int( properties, "width" ); @@ -231,12 +268,8 @@ static int consumer_start( mlt_consumer this ) // Set the running state mlt_properties_set_int( properties, "running", 1 ); - // Inherit the scheduling priority - pthread_attr_init( &thread_attributes ); - pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED ); - // Create the thread - pthread_create( thread, &thread_attributes, consumer_thread, this ); + pthread_create( thread, NULL, consumer_thread, this ); } return 0; } @@ -247,7 +280,7 @@ static int consumer_start( mlt_consumer this ) static int consumer_stop( mlt_consumer this ) { // Get the properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); // Check that we're running if ( mlt_properties_get_int( properties, "running" ) ) @@ -271,7 +304,7 @@ static int consumer_stop( mlt_consumer this ) static int consumer_is_stopped( mlt_consumer this ) { // Get the properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); return !mlt_properties_get_int( properties, "running" ); } @@ -281,7 +314,7 @@ static int consumer_is_stopped( mlt_consumer this ) static AVStream *add_audio_stream( mlt_consumer this, AVFormatContext *oc, int codec_id ) { // Get the properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); // Create a new stream AVStream *st = av_new_stream( oc, 1 ); @@ -367,7 +400,7 @@ static void close_audio( AVFormatContext *oc, AVStream *st ) static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int codec_id ) { // Get the properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); // Create a new stream AVStream *st = av_new_stream( oc, 0 ); @@ -526,7 +559,7 @@ static void *consumer_thread( void *arg ) mlt_consumer this = arg; // Get the properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); // Get the terminate on pause property int terminate_on_pause = mlt_properties_get_int( properties, "terminate_on_pause" ); @@ -555,7 +588,7 @@ static void *consumer_thread( void *arg ) int samples = 0; // AVFormat audio buffer and frame size - int audio_outbuf_size = 2 * 128 * 1024; + int audio_outbuf_size = 10000; uint8_t *audio_outbuf = av_malloc( audio_outbuf_size ); int audio_input_frame_size = 0; @@ -625,7 +658,7 @@ static void *consumer_thread( void *arg ) fmt = guess_format( "mpeg", NULL, NULL ); // We need a filename - default to stdout? - if ( filename == NULL ) + if ( filename == NULL || !strcmp( filename, "" ) ) filename = "pipe:"; // Get the codec ids selected @@ -685,7 +718,7 @@ static void *consumer_thread( void *arg ) // Open the output file, if needed if ( !( fmt->flags & AVFMT_NOFILE ) ) { - if (url_fopen(&oc->pb, filename, URL_RDWR) < 0) + if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0) { fprintf(stderr, "Could not open '%s'\n", filename); mlt_properties_set_int( properties, "running", 0 ); @@ -722,7 +755,7 @@ static void *consumer_thread( void *arg ) frames ++; // Default audio args - frame_properties = mlt_frame_properties( frame ); + frame_properties = MLT_FRAME_PROPERTIES( frame ); // Check for the terminated condition terminated = terminate_on_pause && mlt_properties_get_double( frame_properties, "_speed" ) == 0.0; @@ -732,6 +765,18 @@ static void *consumer_thread( void *arg ) { 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 + if ( fifo == NULL ) + { + fifo = sample_fifo_init( frequency, channels ); + mlt_properties_set_data( properties, "sample_fifo", fifo, 0, ( mlt_destructor )sample_fifo_close, NULL ); + } + + if ( mlt_properties_get_double( frame_properties, "_speed" ) != 1.0 ) + memset( pcm, 0, samples * channels * 2 ); + + // Append the samples sample_fifo_append( fifo, pcm, samples * channels ); total_time += ( samples * 1000000 ) / frequency; } @@ -748,12 +793,12 @@ static void *consumer_thread( void *arg ) { // Compute current audio and video time if (audio_st) - audio_pts = (double)audio_st->pts.val * oc->pts_num / oc->pts_den; + audio_pts = (double)audio_st->pts.val * audio_st->time_base.num / audio_st->time_base.den; else audio_pts = 0.0; if (video_st) - video_pts = (double)video_st->pts.val * oc->pts_num / oc->pts_den; + video_pts = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den; else video_pts = 0.0; @@ -762,17 +807,23 @@ static void *consumer_thread( void *arg ) { if ( channels * audio_input_frame_size < sample_fifo_used( fifo ) ) { - int out_size; AVCodecContext *c; + AVPacket pkt; + av_init_packet( &pkt ); c = &audio_st->codec; sample_fifo_fetch( fifo, buffer, channels * audio_input_frame_size ); - out_size = avcodec_encode_audio( c, audio_outbuf, audio_outbuf_size, buffer ); - + pkt.size = avcodec_encode_audio( c, audio_outbuf, audio_outbuf_size, buffer ); // Write the compressed frame in the media file - if (av_write_frame(oc, audio_st->index, audio_outbuf, out_size) != 0) + if ( c->coded_frame ) + pkt.pts= c->coded_frame->pts; + 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"); } else @@ -788,7 +839,7 @@ static void *consumer_thread( void *arg ) AVCodecContext *c; frame = mlt_deque_pop_front( queue ); - frame_properties = mlt_frame_properties( frame ); + frame_properties = MLT_FRAME_PROPERTIES( frame ); c = &video_st->codec; @@ -799,6 +850,15 @@ static void *consumer_thread( void *arg ) uint8_t *p; uint8_t *q; + 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; @@ -820,7 +880,15 @@ static void *consumer_thread( void *arg ) if (oc->oformat->flags & AVFMT_RAWPICTURE) { // raw video case. The API will change slightly in the near future for that - ret = av_write_frame(oc, video_st->index, (uint8_t *)output, sizeof(AVPicture)); + AVPacket pkt; + av_init_packet(&pkt); + + pkt.flags |= PKT_FLAG_KEY; + pkt.stream_index= video_st->index; + pkt.data= (uint8_t *)output; + pkt.size= sizeof(AVPicture); + + ret = av_write_frame(oc, &pkt); } else { @@ -833,9 +901,19 @@ static void *consumer_thread( void *arg ) // If zero size, it means the image was buffered if (out_size != 0) { - // write the compressed frame in the media file - // XXX: in case of B frames, the pts is not yet valid - ret = av_write_frame( oc, video_st->index, video_outbuf, out_size ); + AVPacket pkt; + av_init_packet( &pkt ); + + if ( c->coded_frame ) + pkt.pts= c->coded_frame->pts; + if(c->coded_frame->key_frame) + pkt.flags |= PKT_FLAG_KEY; + pkt.stream_index= video_st->index; + pkt.data= video_outbuf; + pkt.size= out_size; + + // write the compressed frame in the media file + ret = av_interleaved_write_frame(oc, &pkt); } } frame_count++; @@ -848,11 +926,14 @@ static void *consumer_thread( void *arg ) } } - if ( real_time_output && frames % 25 == 0 ) + if ( real_time_output && frames % 12 == 0 ) { long passed = time_difference( &ante ); - long pending = ( ( ( long )sample_fifo_used( fifo ) * 1000 ) / frequency ) * 1000; - passed -= pending; + if ( fifo != NULL ) + { + long pending = ( ( ( long )sample_fifo_used( fifo ) * 1000 ) / frequency ) * 1000; + passed -= pending; + } if ( passed < total_time ) { long total = ( total_time - passed ); @@ -893,6 +974,8 @@ static void *consumer_thread( void *arg ) // Just in case we terminated on pause mlt_properties_set_int( properties, "running", 0 ); + mlt_consumer_stopped( this ); + return NULL; }