X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Favcodec%2Fencoder.c;h=acf9f28bf5475ac79289fe77800fda03d549d7fa;hb=6d6342b47ebfa8fdad36cbae84ab81fad8bdca9b;hp=2343d1dd9b1b06a84e576c0587ddcd288f537544;hpb=38415e9206b58a252474bb93deabbfcba1ad8804;p=vlc diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c index 2343d1dd9b..acf9f28bf5 100644 --- a/modules/codec/avcodec/encoder.c +++ b/modules/codec/avcodec/encoder.c @@ -1,28 +1,28 @@ /***************************************************************************** - * encoder.c: video and audio encoder using the ffmpeg library + * encoder.c: video and audio encoder using the libavcodec library ***************************************************************************** - * Copyright (C) 1999-2004 the VideoLAN team + * Copyright (C) 1999-2004 VLC authors and VideoLAN * $Id$ * * Authors: Laurent Aimar * Gildas Bazin * Christophe Massiot - * Part of the file Copyright (C) FFMPEG Project Developers + * Part of the file Copyright (C) FFmpeg Project Developers * (mpeg4_default matrixes) * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -40,15 +40,11 @@ #include #include -/* ffmpeg header */ #define HAVE_MMX 1 -#ifdef HAVE_LIBAVCODEC_AVCODEC_H -# include -#else -# include -#endif +#include #include "avcodec.h" +#include "avcommon.h" #define HURRY_UP_GUARD1 (450000) #define HURRY_UP_GUARD2 (300000) @@ -65,7 +61,7 @@ int OpenEncoder ( vlc_object_t * ); void CloseEncoder( vlc_object_t * ); static block_t *EncodeVideo( encoder_t *, picture_t * ); -static block_t *EncodeAudio( encoder_t *, aout_buffer_t * ); +static block_t *EncodeAudio( encoder_t *, block_t * ); struct thread_context_t; @@ -87,21 +83,20 @@ struct thread_context_t }; /***************************************************************************** - * encoder_sys_t : ffmpeg encoder descriptor + * encoder_sys_t : libavcodec encoder descriptor *****************************************************************************/ struct encoder_sys_t { /* - * Ffmpeg properties + * libavcodec properties */ AVCodec *p_codec; AVCodecContext *p_context; /* - * Common properties + * Common buffer mainly for audio as frame size in there needs usually be constant */ char *p_buffer; - uint8_t *p_buffer_out; size_t i_buffer_out; /* @@ -140,9 +135,6 @@ struct encoder_sys_t float f_lumi_masking, f_dark_masking, f_p_masking, f_border_masking; int i_luma_elim, i_chroma_elim; int i_aac_profile; /* AAC profile to use.*/ - /* Used to work around stupid timestamping behaviour in libavcodec */ - uint64_t i_framenum; - mtime_t pi_delay_pts[MAX_FRAME_DELAY]; }; static const char *const ppsz_enc_options[] = { @@ -201,7 +193,11 @@ int OpenEncoder( vlc_object_t *p_this ) const char *psz_namecodec; float f_val; char *psz_val; - int i_val; + + /* Initialization must be done before avcodec_find_encoder() */ + vlc_init_avcodec(); + + config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg ); if( p_enc->fmt_out.i_codec == VLC_CODEC_MP3 ) { @@ -215,6 +211,12 @@ int OpenEncoder( vlc_object_t *p_this ) i_codec_id = CODEC_ID_MP2; psz_namecodec = "MPEG I/II Layer 2"; } + else if( p_enc->fmt_out.i_codec == VLC_CODEC_MP1V ) + { + i_cat = VIDEO_ES; + i_codec_id = CODEC_ID_MPEG1VIDEO; + psz_namecodec = "MPEG-1 video"; + } else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id, &psz_namecodec ) ) { @@ -250,9 +252,6 @@ int OpenEncoder( vlc_object_t *p_this ) return VLC_EGENERIC; } - /* Initialization must be done before avcodec_find_encoder() */ - InitLibavcodec( p_this ); - char *psz_encoder = var_GetString( p_this, ENC_CFG_PREFIX "codec" ); if( psz_encoder && *psz_encoder ) { @@ -272,8 +271,8 @@ int OpenEncoder( vlc_object_t *p_this ) if( !p_codec ) { msg_Err( p_enc, "cannot find encoder %s\n" -"*** Your FFMPEG installation is crippled. ***\n" -"*** Please check with your FFMPEG packager. ***\n" +"*** Your Libav/FFmpeg installation is crippled. ***\n" +"*** Please check with your Libav/FFmpeg packager. ***\n" "*** This is NOT a VLC media player issue. ***", psz_namecodec ); dialog_Fatal( p_enc, _("Streaming / Transcoding failed"), _( @@ -281,7 +280,7 @@ int OpenEncoder( vlc_object_t *p_this ) * Downstream packager, you had better not patch this out, or I will be really * annoyed. Think about it - you don't want to fork the VLC translation files, * do you? -- Courmisch, 2008-10-22 */ -"It seems your FFMPEG (libavcodec) installation lacks the following encoder:\n" +"It seems your Libav/FFmpeg (libavcodec) installation lacks the following encoder:\n" "%s.\n" "If you don't know how to fix this, ask for support from your distribution.\n" "\n" @@ -295,13 +294,10 @@ int OpenEncoder( vlc_object_t *p_this ) if( ( p_sys = calloc( 1, sizeof(encoder_sys_t) ) ) == NULL ) return VLC_ENOMEM; p_enc->p_sys = p_sys; + p_sys->i_samples_delay = 0; p_sys->p_codec = p_codec; - p_enc->pf_encode_video = EncodeVideo; - p_enc->pf_encode_audio = EncodeAudio; - p_sys->p_buffer = NULL; - p_sys->p_buffer_out = NULL; p_sys->i_buffer_out = 0; #if LIBAVCODEC_VERSION_MAJOR < 54 @@ -311,31 +307,15 @@ int OpenEncoder( vlc_object_t *p_this ) #endif p_sys->p_context = p_context; p_sys->p_context->codec_id = p_sys->p_codec->id; - p_context->debug = var_InheritInteger( p_enc, "ffmpeg-debug" ); + p_context->debug = var_InheritInteger( p_enc, "avcodec-debug" ); p_context->opaque = (void *)p_this; - /* Set CPU capabilities */ - unsigned i_cpu = vlc_CPU(); - p_context->dsp_mask = 0; - if( !(i_cpu & CPU_CAPABILITY_MMX) ) - { - p_context->dsp_mask |= AV_CPU_FLAG_MMX; - } - if( !(i_cpu & CPU_CAPABILITY_MMXEXT) ) - { - p_context->dsp_mask |= AV_CPU_FLAG_MMX2; - } - if( !(i_cpu & CPU_CAPABILITY_3DNOW) ) - { - p_context->dsp_mask |= AV_CPU_FLAG_3DNOW; - } - if( !(i_cpu & CPU_CAPABILITY_SSE) ) - { - p_context->dsp_mask |= AV_CPU_FLAG_SSE; - p_context->dsp_mask |= AV_CPU_FLAG_SSE2; - } - - config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg ); + /* set CPU capabilities */ +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 51, 25, 0 ) + av_set_cpu_flags_mask( INT_MAX & ~GetVlcDspMask() ); +#else + p_context->dsp_mask = GetVlcDspMask(); +#endif p_sys->i_key_int = var_GetInteger( p_enc, ENC_CFG_PREFIX "keyint" ); p_sys->i_b_frames = var_GetInteger( p_enc, ENC_CFG_PREFIX "bframes" ); @@ -382,9 +362,7 @@ int OpenEncoder( vlc_object_t *p_this ) p_sys->i_qmax = var_GetInteger( p_enc, ENC_CFG_PREFIX "qmax" ); p_sys->b_trellis = var_GetBool( p_enc, ENC_CFG_PREFIX "trellis" ); - i_val = var_GetInteger( p_enc, ENC_CFG_PREFIX "strict" ); - if( i_val < - 1 || i_val > 1 ) i_val = 0; - p_context->strict_std_compliance = i_val; + p_context->strict_std_compliance = var_GetInteger( p_enc, ENC_CFG_PREFIX "strict" ); p_sys->f_lumi_masking = var_GetFloat( p_enc, ENC_CFG_PREFIX "lumi-masking" ); p_sys->f_dark_masking = var_GetFloat( p_enc, ENC_CFG_PREFIX "dark-masking" ); @@ -394,7 +372,7 @@ int OpenEncoder( vlc_object_t *p_this ) p_sys->i_chroma_elim = var_GetInteger( p_enc, ENC_CFG_PREFIX "chroma-elim-threshold" ); psz_val = var_GetString( p_enc, ENC_CFG_PREFIX "aac-profile" ); - /* ffmpeg uses faac encoder atm, and it has issues with + /* libavcodec uses faac encoder atm, and it has issues with * other than low-complexity profile, so default to that */ p_sys->i_aac_profile = FF_PROFILE_AAC_LOW; if( psz_val && *psz_val ) @@ -407,8 +385,15 @@ int OpenEncoder( vlc_object_t *p_this ) else if( !strncmp( psz_val, "ssr", 3 ) ) p_sys->i_aac_profile = FF_PROFILE_AAC_SSR; #endif - else if( !strncmp( psz_val, "ltp", 3 ) ) + else if( !strncmp( psz_val, "ltp", 3 ) ) p_sys->i_aac_profile = FF_PROFILE_AAC_LTP; +#if LIBAVCODEC_VERSION_CHECK( 54, 19, 0, 35, 100 ) +/* These require libavcodec with libfdk-aac */ + else if( !strncmp( psz_val, "hev2", 4 ) ) + p_sys->i_aac_profile = FF_PROFILE_AAC_HE_V2; + else if( !strncmp( psz_val, "hev1", 4 ) ) + p_sys->i_aac_profile = FF_PROFILE_AAC_HE; +#endif else { msg_Warn( p_enc, "unknown AAC profile requested, setting it to low" ); @@ -468,19 +453,14 @@ int OpenEncoder( vlc_object_t *p_this ) p_context->b_frame_strategy = 0; if( !p_context->max_b_frames && ( p_enc->fmt_out.i_codec == VLC_CODEC_MPGV || - p_enc->fmt_out.i_codec == VLC_CODEC_MP2V || - p_enc->fmt_out.i_codec == VLC_CODEC_MP1V ) ) + p_enc->fmt_out.i_codec == VLC_CODEC_MP2V ) ) p_context->flags |= CODEC_FLAG_LOW_DELAY; - if( p_enc->fmt_out.i_codec == VLC_CODEC_MP2V ) - p_context->idct_algo = FF_IDCT_LIBMPEG2MMX; - av_reduce( &p_context->sample_aspect_ratio.num, &p_context->sample_aspect_ratio.den, p_enc->fmt_in.video.i_sar_num, p_enc->fmt_in.video.i_sar_den, 1 << 30 ); - p_sys->p_buffer_out = NULL; p_enc->fmt_in.i_codec = VLC_CODEC_I420; p_enc->fmt_in.video.i_chroma = p_enc->fmt_in.i_codec; @@ -591,8 +571,11 @@ int OpenEncoder( vlc_object_t *p_this ) else { p_context->rc_qsquish = 1.0; - p_context->rc_max_rate = p_enc->fmt_out.i_bitrate; - p_context->rc_min_rate = p_enc->fmt_out.i_bitrate; + if( p_sys->i_rc_buffer_size ) + { + p_context->rc_max_rate = p_enc->fmt_out.i_bitrate; + p_context->rc_min_rate = p_enc->fmt_out.i_bitrate; + } p_context->rc_buffer_size = p_sys->i_rc_buffer_size; /* This is from ffmpeg's ffmpeg.c : */ p_context->rc_initial_buffer_occupancy @@ -610,7 +593,8 @@ int OpenEncoder( vlc_object_t *p_this ) p_context->sample_fmt = p_codec->sample_fmts ? p_codec->sample_fmts[0] : AV_SAMPLE_FMT_S16; - p_enc->fmt_in.i_codec = VLC_CODEC_S16N; + p_enc->fmt_in.i_codec = GetVlcAudioFormat( p_context->sample_fmt ); + p_context->sample_rate = p_enc->fmt_out.audio.i_rate; p_context->time_base.num = 1; p_context->time_base.den = p_context->sample_rate; @@ -630,21 +614,20 @@ int OpenEncoder( vlc_object_t *p_this ) /* Misc parameters */ p_context->bit_rate = p_enc->fmt_out.i_bitrate; -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 69, 2 ) /* Set reasonable defaults to VP8, based on libvpx-720p preset from libvpx ffmpeg-patch */ if( i_codec_id == CODEC_ID_VP8 ) { /* Lets give bitrate tolerance */ - p_context->bit_rate_tolerance = __MAX(2 * p_enc->fmt_out.i_bitrate, p_sys->i_vtolerance ); + p_context->bit_rate_tolerance = __MAX(2 * (int)p_enc->fmt_out.i_bitrate, p_sys->i_vtolerance ); /* default to 120 frames between keyframe */ if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "keyint" ) ) p_context->gop_size = 120; /* Don't set rc-values atm, they were from time before - libvpx was officially in ffmpeg */ + libvpx was officially in FFmpeg */ //p_context->rc_max_rate = 24 * 1000 * 1000; //24M //p_context->rc_min_rate = 40 * 1000; // 40k - /* seems that ffmpeg presets have 720p as divider for buffers */ + /* seems that FFmpeg presets have 720p as divider for buffers */ if( p_enc->fmt_out.video.i_height >= 720 ) { /* Check that we don't overrun users qmin/qmax values */ @@ -678,7 +661,6 @@ int OpenEncoder( vlc_object_t *p_this ) p_context->mb_static_threshold = 0; #endif } -#endif if( i_codec_id == CODEC_ID_RAWVIDEO ) { @@ -824,9 +806,9 @@ int OpenEncoder( vlc_object_t *p_this ) if( p_enc->fmt_in.i_cat == AUDIO_ES ) { - GetVlcAudioFormat( &p_enc->fmt_in.i_codec, - &p_enc->fmt_in.audio.i_bitspersample, - p_sys->p_context->sample_fmt ); + p_enc->fmt_in.i_codec = GetVlcAudioFormat( p_sys->p_context->sample_fmt ); + p_enc->fmt_in.audio.i_bitspersample = aout_BitsPerSample( p_enc->fmt_in.i_codec ); + p_sys->i_sample_bytes = (p_enc->fmt_in.audio.i_bitspersample / 8) * p_context->channels; p_sys->i_frame_size = p_context->frame_size > 1 ? @@ -838,26 +820,23 @@ int OpenEncoder( vlc_object_t *p_this ) goto error; } p_enc->fmt_out.audio.i_blockalign = p_context->block_align; - p_enc->fmt_out.audio.i_bitspersample = aout_BitsPerSample( vlc_fourcc_GetCodec( AUDIO_ES, p_enc->fmt_out.i_codec ) ); + p_enc->fmt_out.audio.i_bitspersample = aout_BitsPerSample( p_enc->fmt_out.i_codec ); if( p_context->frame_size > 1 ) p_sys->i_buffer_out = 8 * AVCODEC_MAX_AUDIO_FRAME_SIZE; else p_sys->i_buffer_out = p_sys->i_frame_size * p_sys->i_sample_bytes; - p_sys->p_buffer_out = malloc( p_sys->i_buffer_out ); - if ( p_sys->p_buffer_out == NULL ) - { - goto error; - } } msg_Dbg( p_enc, "found encoder %s", psz_namecodec ); + p_enc->pf_encode_video = EncodeVideo; + p_enc->pf_encode_audio = EncodeAudio; + return VLC_SUCCESS; error: free( p_enc->fmt_out.p_extra ); free( p_sys->p_buffer ); - free( p_sys->p_buffer_out ); free( p_sys ); return VLC_ENOMEM; } @@ -877,105 +856,92 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) const int bytesPerPixel = p_enc->fmt_out.video.i_bits_per_pixel ? p_enc->fmt_out.video.i_bits_per_pixel / 8 : 3; const int blocksize = __MAX( FF_MIN_BUFFER_SIZE,bytesPerPixel * p_sys->p_context->height * p_sys->p_context->width + 200 ); - block_t *p_block = block_New( p_enc, blocksize ); + block_t *p_block = block_Alloc( blocksize ); if( likely(p_pict) ) { - AVFrame frame; - memset( &frame, 0, sizeof( AVFrame ) ); + AVFrame *frame; + frame = avcodec_alloc_frame(); for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ ) { - frame.data[i_plane] = p_pict->p[i_plane].p_pixels; - frame.linesize[i_plane] = p_pict->p[i_plane].i_pitch; + frame->data[i_plane] = p_pict->p[i_plane].p_pixels; + frame->linesize[i_plane] = p_pict->p[i_plane].i_pitch; } - /* Let ffmpeg select the frame type */ - frame.pict_type = 0; + /* Let libavcodec select the frame type */ + frame->pict_type = 0; + + frame->repeat_pict = p_pict->i_nb_fields - 2; + frame->interlaced_frame = !p_pict->b_progressive; + frame->top_field_first = !!p_pict->b_top_field_first; - frame.repeat_pict = p_pict->i_nb_fields - 2; - frame.interlaced_frame = !p_pict->b_progressive; - frame.top_field_first = !!p_pict->b_top_field_first; + /* Set the pts of the frame being encoded */ + frame->pts = p_pict->date ? p_pict->date : (int64_t)AV_NOPTS_VALUE; - /* Set the pts of the frame being encoded (segfaults with mpeg4!)*/ - if( p_enc->fmt_out.i_codec != VLC_CODEC_MP4V ) + if ( p_sys->b_hurry_up && frame->pts != (int64_t)AV_NOPTS_VALUE ) { - frame.pts = p_pict->date ? p_pict->date : (int64_t)AV_NOPTS_VALUE; + mtime_t current_date = mdate(); - if ( p_sys->b_hurry_up && frame.pts != (int64_t)AV_NOPTS_VALUE ) + if ( current_date + HURRY_UP_GUARD3 > frame->pts ) { - mtime_t current_date = mdate(); + p_sys->p_context->mb_decision = FF_MB_DECISION_SIMPLE; + p_sys->p_context->trellis = 0; + msg_Dbg( p_enc, "hurry up mode 3" ); + } + else + { + p_sys->p_context->mb_decision = p_sys->i_hq; - if ( current_date + HURRY_UP_GUARD3 > frame.pts ) + if ( current_date + HURRY_UP_GUARD2 > frame->pts ) { - p_sys->p_context->mb_decision = FF_MB_DECISION_SIMPLE; p_sys->p_context->trellis = 0; - msg_Dbg( p_enc, "hurry up mode 3" ); + p_sys->p_context->noise_reduction = p_sys->i_noise_reduction + + (HURRY_UP_GUARD2 + current_date - frame->pts) / 500; + msg_Dbg( p_enc, "hurry up mode 2" ); } else { - p_sys->p_context->mb_decision = p_sys->i_hq; - - if ( current_date + HURRY_UP_GUARD2 > frame.pts ) - { - p_sys->p_context->trellis = 0; - p_sys->p_context->noise_reduction = p_sys->i_noise_reduction - + (HURRY_UP_GUARD2 + current_date - frame.pts) / 500; - msg_Dbg( p_enc, "hurry up mode 2" ); - } - else - { - p_sys->p_context->trellis = p_sys->b_trellis; - - p_sys->p_context->noise_reduction = - p_sys->i_noise_reduction; - } - } + p_sys->p_context->trellis = p_sys->b_trellis; - if ( current_date + HURRY_UP_GUARD1 > frame.pts ) - { - frame.pict_type = AV_PICTURE_TYPE_P; - /* msg_Dbg( p_enc, "hurry up mode 1 %lld", current_date + HURRY_UP_GUARD1 - frame.pts ); */ + p_sys->p_context->noise_reduction = + p_sys->i_noise_reduction; } } - } - else - { - frame.pts = (int64_t)AV_NOPTS_VALUE; + + if ( current_date + HURRY_UP_GUARD1 > frame->pts ) + { + frame->pict_type = AV_PICTURE_TYPE_P; + /* msg_Dbg( p_enc, "hurry up mode 1 %lld", current_date + HURRY_UP_GUARD1 - frame.pts ); */ + } } - if ( frame.pts != (int64_t)AV_NOPTS_VALUE && frame.pts != 0 ) + if ( frame->pts != (int64_t)AV_NOPTS_VALUE && frame->pts != 0 ) { - if ( p_sys->i_last_pts == frame.pts ) + if ( p_sys->i_last_pts == frame->pts ) { msg_Warn( p_enc, "almost fed libavcodec with two frames with the " - "same PTS (%"PRId64 ")", frame.pts ); + "same PTS (%"PRId64 ")", frame->pts ); + av_freep( &frame ); return NULL; } - else if ( p_sys->i_last_pts > frame.pts ) + else if ( p_sys->i_last_pts > frame->pts ) { msg_Warn( p_enc, "almost fed libavcodec with a frame in the " "past (current: %"PRId64 ", last: %"PRId64")", - frame.pts, p_sys->i_last_pts ); + frame->pts, p_sys->i_last_pts ); + av_freep( &frame ); return NULL; } else { - p_sys->i_last_pts = frame.pts; + p_sys->i_last_pts = frame->pts; } } - frame.quality = p_sys->i_quality; - - /* Ugly work-around for stupid libavcodec behaviour */ - p_sys->i_framenum++; - p_sys->pi_delay_pts[p_sys->i_framenum % MAX_FRAME_DELAY] = frame.pts; - frame.pts = p_sys->i_framenum * AV_TIME_BASE * - p_enc->fmt_in.video.i_frame_rate_base; - frame.pts += p_enc->fmt_in.video.i_frame_rate - 1; - frame.pts /= p_enc->fmt_in.video.i_frame_rate; - /* End work-around */ + frame->quality = p_sys->i_quality; i_out = avcodec_encode_video( p_sys->p_context, p_block->p_buffer, - p_block->i_buffer, &frame ); + p_block->i_buffer, frame ); + av_freep( &frame ); } else { @@ -1010,16 +976,6 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) p_sys->i_buggy_pts_detect = p_sys->p_context->coded_frame->pts; p_block->i_pts = p_sys->p_context->coded_frame->pts; - /* Ugly work-around for stupid libavcodec behaviour */ - { - int64_t i_framenum = p_block->i_pts * - p_enc->fmt_in.video.i_frame_rate / - p_enc->fmt_in.video.i_frame_rate_base / AV_TIME_BASE; - - p_block->i_pts = p_sys->pi_delay_pts[i_framenum % MAX_FRAME_DELAY]; - } - /* End work-around */ - if( p_sys->p_context->coded_frame->pict_type != AV_PICTURE_TYPE_I && p_sys->p_context->coded_frame->pict_type != AV_PICTURE_TYPE_P ) { @@ -1067,90 +1023,173 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) /**************************************************************************** * EncodeAudio: the whole thing ****************************************************************************/ -static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) +static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf ) { encoder_sys_t *p_sys = p_enc->p_sys; block_t *p_block, *p_chain = NULL; + AVFrame *frame=NULL; + int got_packet,i_out,i_samples_left=0,i_data_offset = 0; + + //i_samples_left is amount of samples we get + i_samples_left = p_aout_buf ? p_aout_buf->i_nb_samples : 0; + + if( p_sys->i_samples_delay > 0 ) + { + AVPacket packet; + //How much we need to copy from new packet + const int leftover = __MAX(0,__MIN(i_samples_left, (p_sys->i_frame_size - p_sys->i_samples_delay))); + + frame = avcodec_alloc_frame(); + frame->nb_samples = p_sys->i_samples_delay + leftover; + frame->format = p_sys->p_context->sample_fmt; + + //Copy samples from new packet to buffer to get frame size + if( likely( leftover ) ) + memcpy( p_sys->p_buffer+(p_sys->i_samples_delay*p_sys->i_sample_bytes), p_aout_buf->p_buffer, leftover*p_sys->i_sample_bytes*p_enc->fmt_in.audio.i_channels); + + if( avcodec_fill_audio_frame( frame, p_enc->fmt_in.audio.i_channels, + p_sys->p_context->sample_fmt, + p_sys->p_buffer, + (p_sys->i_samples_delay + leftover) * p_sys->i_sample_bytes * p_enc->fmt_in.audio.i_channels, + 0) < 0 ) + msg_Err( p_enc, "Filling on leftovers error i_leftover %d i_samples_left %d samples_delay %d frame size %d", leftover, i_samples_left, p_sys->i_samples_delay, p_sys->i_frame_size ); + + if( likely( p_aout_buf ) ) + frame->pts = p_aout_buf->i_pts - + (mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay / + (mtime_t)p_enc->fmt_in.audio.i_rate; + + p_sys->i_samples_delay = 0; + i_data_offset += leftover * p_sys->i_sample_bytes * p_enc->fmt_in.audio.i_channels; + i_samples_left -= leftover; + + p_block = block_Alloc( p_sys->i_buffer_out ); + av_init_packet( &packet ); + packet.data = p_block->p_buffer; + packet.size = p_block->i_buffer; + + i_out = avcodec_encode_audio2( p_sys->p_context, &packet, frame, &got_packet ); + p_block->i_buffer = packet.size; + + + /*FIXME: same as avcodec_free_frame, but we don't require so new avcodec that has it*/ + if( frame->extended_data != frame->data ) + av_freep( frame->extended_data ); + av_freep( &frame ); + if( unlikely( !got_packet || ( i_out < 0 ) ) ) + { + if( i_out < 0 ) + { + msg_Err( p_enc,"Encoding problem..."); + return p_chain; + } + } else { + p_block->i_buffer = packet.size; - uint8_t *p_buffer = p_aout_buf->p_buffer; - int i_samples = p_aout_buf->i_nb_samples; - int i_samples_delay = p_sys->i_samples_delay; + p_block->i_length = (mtime_t)1000000 * + (mtime_t)p_sys->i_frame_size / + (mtime_t)p_sys->p_context->sample_rate; - p_sys->i_pts = p_aout_buf->i_pts - - (mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay / - (mtime_t)p_enc->fmt_in.audio.i_rate; + p_block->i_dts = p_block->i_pts = packet.pts; - p_sys->i_samples_delay += i_samples; + block_ChainAppend( &p_chain, p_block ); + } + } - while( p_sys->i_samples_delay >= p_sys->i_frame_size ) + if( unlikely( !p_aout_buf ) ) { - void *p_samples; - int i_out; - p_block = block_New( p_enc, p_sys->i_buffer_out ); + msg_Dbg(p_enc,"Flushing.."); + do { + AVPacket packet; + p_block = block_Alloc( p_sys->i_buffer_out ); + av_init_packet( &packet ); + packet.data = p_block->p_buffer; + packet.size = p_block->i_buffer; + + i_out = avcodec_encode_audio2( p_sys->p_context, &packet, NULL, &got_packet ); + p_block->i_buffer = packet.size; + + p_block->i_length = (mtime_t)1000000 * + (mtime_t)p_sys->i_frame_size / + (mtime_t)p_sys->p_context->sample_rate; + + p_block->i_dts = p_block->i_pts = packet.pts; + + if( !i_out && got_packet ) + block_ChainAppend( &p_chain, p_block ); + } while( got_packet && !i_out ); + return p_chain; + } - if( i_samples_delay ) - { - /* Take care of the left-over from last time */ - int i_delay_size = i_samples_delay; - int i_size = (p_sys->i_frame_size - i_delay_size) * - p_sys->i_sample_bytes; - - memcpy( p_sys->p_buffer + i_delay_size * p_sys->i_sample_bytes, - p_buffer, i_size ); - p_buffer -= i_delay_size * p_sys->i_sample_bytes; - i_samples += i_samples_delay; - i_samples_delay = 0; - - p_samples = p_sys->p_buffer; - } - else - { - p_samples = p_buffer; - } + while( i_samples_left >= p_sys->i_frame_size ) + { + AVPacket packet = {0}; + frame = avcodec_alloc_frame(); - i_out = avcodec_encode_audio( p_sys->p_context, p_block->p_buffer, - p_block->i_buffer, p_samples ); + frame->nb_samples = p_sys->i_frame_size; + frame->format = p_sys->p_context->sample_fmt; -#if 0 - msg_Warn( p_enc, "avcodec_encode_audio: %d", i_out ); -#endif - p_buffer += p_sys->i_frame_size * p_sys->i_sample_bytes; - p_sys->i_samples_delay -= p_sys->i_frame_size; - i_samples -= p_sys->i_frame_size; + if( avcodec_fill_audio_frame( frame, p_enc->fmt_in.audio.i_channels, + p_sys->p_context->sample_fmt, + p_aout_buf->p_buffer+i_data_offset, + p_sys->i_frame_size * p_sys->i_sample_bytes * p_enc->fmt_in.audio.i_channels, + 0) < 0 ) + msg_Err( p_enc, "filling error on encode" ); + + i_samples_left -= p_sys->i_frame_size; + i_data_offset += p_sys->i_frame_size * p_sys->i_sample_bytes * p_enc->fmt_in.audio.i_channels; + + frame->pts = p_aout_buf->i_pts; - if( i_out <= 0 ) + p_block = block_Alloc( p_sys->i_buffer_out ); + av_init_packet( &packet ); + packet.data = p_block->p_buffer; + packet.size = p_block->i_buffer; + + i_out = avcodec_encode_audio2( p_sys->p_context, &packet, frame, &got_packet ); + p_block->i_buffer = packet.size; + + if( frame->extended_data != frame->data ) + av_freep( frame->extended_data ); + av_freep( &frame ); + if( unlikely( !got_packet || ( i_out < 0 ) ) ) { + if( i_out < 0 ) + { + msg_Err( p_enc,"Encoding problem.."); + return p_chain; + } block_Release( p_block ); continue; } - p_block->i_buffer = i_out; + p_block->i_buffer = packet.size; p_block->i_length = (mtime_t)1000000 * (mtime_t)p_sys->i_frame_size / (mtime_t)p_sys->p_context->sample_rate; - p_block->i_dts = p_block->i_pts = p_sys->i_pts; + p_block->i_dts = p_block->i_pts = packet.pts; - /* Update pts */ - p_sys->i_pts += p_block->i_length; block_ChainAppend( &p_chain, p_block ); } + if( i_samples_left < 0 ) + msg_Err( p_enc, "I_data_left overflow"); - /* Backup the remaining raw samples */ - if( i_samples ) + // We have leftover samples that don't fill frame_size, and libavcodec doesn't seem to like + // that frame has more data than p_sys->i_frame_size most of the cases currently. + if( i_samples_left > 0 ) { - memcpy( &p_sys->p_buffer[i_samples_delay * p_sys->i_sample_bytes], - p_buffer, - i_samples * p_sys->i_sample_bytes ); + memcpy( p_sys->p_buffer, p_aout_buf->p_buffer+i_data_offset , i_samples_left*p_sys->i_sample_bytes*p_enc->fmt_in.audio.i_channels); + p_sys->i_samples_delay = i_samples_left; } return p_chain; } /***************************************************************************** - * CloseEncoder: ffmpeg encoder destruction + * CloseEncoder: libavcodec encoder destruction *****************************************************************************/ void CloseEncoder( vlc_object_t *p_this ) { @@ -1163,7 +1202,6 @@ void CloseEncoder( vlc_object_t *p_this ) av_free( p_sys->p_context ); free( p_sys->p_buffer ); - free( p_sys->p_buffer_out ); free( p_sys ); }