[vlc-commits] avcodec: don't guess size when encoding video
Tristan Matthews
git at videolan.org
Sun Jul 6 18:12:05 CEST 2014
vlc/vlc-2.2 | branch: master | Tristan Matthews <le.businessman at gmail.com> | Fri Jul 4 09:34:57 2014 -0400| [390c2b665e7e1140446367212f9de845330ab328] | committer: Tristan Matthews
avcodec: don't guess size when encoding video
Instead, let avcodec_encode_video2 allocate the buffer, then
wrap it before handing it off.
Fixes #11605
(cherry picked from commit 03cf55c6f56d9f9d27e46dfea07f15714e4c416c)
Signed-off-by: Tristan Matthews <le.businessman at gmail.com>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=390c2b665e7e1140446367212f9de845330ab328
---
modules/codec/avcodec/encoder.c | 85 ++++++++++++++++++++++++++++-----------
1 file changed, 61 insertions(+), 24 deletions(-)
diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index 65ce285..b2eed27 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -1010,6 +1010,44 @@ error:
return VLC_ENOMEM;
}
+#if (LIBAVCODEC_VERSION_MAJOR >= 54)
+typedef struct
+{
+ block_t self;
+ AVPacket packet;
+} vlc_av_packet_t;
+
+static void vlc_av_packet_Release(block_t *block)
+{
+ vlc_av_packet_t *b = (void *) block;
+
+ av_free_packet(&b->packet);
+ free(b);
+}
+
+static block_t *vlc_av_packet_Wrap(AVPacket *packet, mtime_t i_length)
+{
+ vlc_av_packet_t *b = malloc( sizeof( *b ) );
+ if( unlikely(b == NULL) )
+ return NULL;
+
+ block_t *p_block = &b->self;
+
+ block_Init(p_block, packet->data, packet->size);
+ p_block->i_nb_samples = 0;
+ p_block->pf_release = vlc_av_packet_Release;
+ b->packet = *packet;
+
+ p_block->i_length = i_length;
+ p_block->i_pts = packet->pts;
+ p_block->i_dts = packet->dts;
+ if( unlikely( packet->flags & AV_PKT_FLAG_CORRUPT ) )
+ p_block->i_flags |= BLOCK_FLAG_CORRUPTED;
+
+ return p_block;
+}
+#endif
+
/****************************************************************************
* EncodeVideo: the whole thing
****************************************************************************/
@@ -1017,19 +1055,6 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
{
encoder_sys_t *p_sys = p_enc->p_sys;
int i_plane;
- /* Initialize the video output buffer the first time.
- * This is done here instead of OpenEncoder() because we need the actual
- * bits_per_pixel value, without having to assume anything.
- */
- const int bitsPerPixel = p_enc->fmt_out.video.i_bits_per_pixel ?
- p_enc->fmt_out.video.i_bits_per_pixel :
- p_sys->p_context->bits_per_coded_sample ?
- p_sys->p_context->bits_per_coded_sample :
- 24;
- const int blocksize = __MAX( FF_MIN_BUFFER_SIZE, ( bitsPerPixel * p_sys->p_context->height * p_sys->p_context->width ) / 8 + 200 );
- block_t *p_block = block_Alloc( blocksize );
- if( unlikely(p_block == NULL) )
- return NULL;
AVFrame *frame = NULL;
if( likely(p_pict) ) {
@@ -1094,7 +1119,6 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
{
msg_Warn( p_enc, "almost fed libavcodec with two frames with "
"the same PTS (%"PRId64 ")", frame->pts );
- block_Release( p_block );
return NULL;
}
else if ( p_sys->i_last_pts > frame->pts )
@@ -1102,7 +1126,6 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
msg_Warn( p_enc, "almost fed libavcodec with a frame in the "
"past (current: %"PRId64 ", last: %"PRId64")",
frame->pts, p_sys->i_last_pts );
- block_Release( p_block );
return NULL;
}
else
@@ -1114,27 +1137,41 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
#if (LIBAVCODEC_VERSION_MAJOR >= 54)
AVPacket av_pkt;
+ av_pkt.data = NULL;
+ av_pkt.size = 0;
int is_data;
av_init_packet( &av_pkt );
- av_pkt.data = p_block->p_buffer;
- av_pkt.size = p_block->i_buffer;
if( avcodec_encode_video2( p_sys->p_context, &av_pkt, frame, &is_data ) < 0
|| is_data == 0 )
{
- block_Release( p_block );
return NULL;
}
- p_block->i_buffer = av_pkt.size;
- p_block->i_length = av_pkt.duration / p_sys->p_context->time_base.den;
- p_block->i_pts = av_pkt.pts;
- p_block->i_dts = av_pkt.dts;
- if( unlikely( av_pkt.flags & AV_PKT_FLAG_CORRUPT ) )
- p_block->i_flags |= BLOCK_FLAG_CORRUPTED;
+ block_t *p_block = vlc_av_packet_Wrap( &av_pkt,
+ av_pkt.duration / p_sys->p_context->time_base.den);
+ if( unlikely(p_block == NULL) )
+ {
+ av_free_packet( &av_pkt );
+ return NULL;
+ }
#else
+ /* Initialize the video output buffer the first time.
+ * This is done here instead of OpenEncoder() because we need the actual
+ * bits_per_pixel value, without having to assume anything.
+ */
+ const int bitsPerPixel = p_enc->fmt_out.video.i_bits_per_pixel ?
+ p_enc->fmt_out.video.i_bits_per_pixel :
+ p_sys->p_context->bits_per_coded_sample ?
+ p_sys->p_context->bits_per_coded_sample :
+ 24;
+ const int blocksize = __MAX( FF_MIN_BUFFER_SIZE, ( bitsPerPixel * p_sys->p_context->height * p_sys->p_context->width ) / 8 + 200 );
+ block_t *p_block = block_Alloc( blocksize );
+ if( unlikely(p_block == NULL) )
+ return NULL;
+
int i_out = avcodec_encode_video( p_sys->p_context, p_block->p_buffer,
p_block->i_buffer, frame );
if( i_out <= 0 )
More information about the vlc-commits
mailing list