#include "avcodec.h"
#include "bytestream.h"
#include "error_resilience.h"
-#include "hwaccel.h"
+#include "hwconfig.h"
#include "idctdsp.h"
#include "internal.h"
#include "mpeg_er.h"
AVPanScan pan_scan; /* some temporary storage for the panscan */
AVStereo3D stereo3d;
int has_stereo3d;
- uint8_t *a53_caption;
- int a53_caption_size;
+ AVBufferRef *a53_buf_ref;
uint8_t afd;
int has_afd;
int slice_count;
}
/**
- * Note: this function can read out of range and crash for corrupt streams.
* Changing this would eat up any speed benefits it has.
* Do not use "fast" flag if you need the code to be robust.
*/
}
/**
- * Note: this function can read out of range and crash for corrupt streams.
* Changing this would eat up any speed benefits it has.
* Do not use "fast" flag if you need the code to be robust.
*/
}
/**
- * Note: this function can read out of range and crash for corrupt streams.
* Changing this would eat up any speed benefits it has.
* Do not use "fast" flag if you need the code to be robust.
*/
MpegEncContext *s = &s1->mpeg_enc_ctx;
int horiz_size_ext, vert_size_ext;
int bit_rate_ext;
+ AVCPBProperties *cpb_props;
skip_bits(&s->gb, 1); /* profile and level esc*/
s->avctx->profile = get_bits(&s->gb, 3);
ff_dlog(s->avctx, "sequence extension\n");
s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;
+ if (cpb_props = ff_add_cpb_side_data(s->avctx)) {
+ cpb_props->buffer_size = s1->rc_buffer_size;
+ if (s->bit_rate != 0x3FFFF*400)
+ cpb_props->max_bitrate = s->bit_rate;
+ }
+
if (s->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(s->avctx, AV_LOG_DEBUG,
"profile: %d, level: %d ps: %d cf:%d vbv buffer: %d, bitrate:%"PRId64"\n",
return AVERROR(ENOMEM);
memcpy(pan_scan->data, &s1->pan_scan, sizeof(s1->pan_scan));
- if (s1->a53_caption) {
- AVFrameSideData *sd = av_frame_new_side_data(
+ if (s1->a53_buf_ref) {
+ AVFrameSideData *sd = av_frame_new_side_data_from_buf(
s->current_picture_ptr->f, AV_FRAME_DATA_A53_CC,
- s1->a53_caption_size);
- if (sd)
- memcpy(sd->data, s1->a53_caption, s1->a53_caption_size);
- av_freep(&s1->a53_caption);
+ s1->a53_buf_ref);
+ if (!sd)
+ av_buffer_unref(&s1->a53_buf_ref);
+ s1->a53_buf_ref = NULL;
}
if (s1->has_stereo3d) {
/* extract A53 Part 4 CC data */
int cc_count = p[5] & 0x1f;
if (cc_count > 0 && buf_size >= 7 + cc_count * 3) {
- av_freep(&s1->a53_caption);
- s1->a53_caption_size = cc_count * 3;
- s1->a53_caption = av_malloc(s1->a53_caption_size);
- if (!s1->a53_caption) {
- s1->a53_caption_size = 0;
- } else {
- memcpy(s1->a53_caption, p + 7, s1->a53_caption_size);
- }
+ int old_size = s1->a53_buf_ref ? s1->a53_buf_ref->size : 0;
+ const uint64_t new_size = (old_size + cc_count
+ * UINT64_C(3));
+ int ret;
+
+ if (new_size > INT_MAX)
+ return AVERROR(EINVAL);
+
+ ret = av_buffer_realloc(&s1->a53_buf_ref, new_size);
+ if (ret >= 0)
+ memcpy(s1->a53_buf_ref->data + old_size, p + 7, cc_count * UINT64_C(3));
+
avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS;
}
return 1;
/* extract SCTE-20 CC data */
GetBitContext gb;
int cc_count = 0;
- int i;
+ int i, ret;
init_get_bits(&gb, p + 2, buf_size - 2);
cc_count = get_bits(&gb, 5);
if (cc_count > 0) {
- av_freep(&s1->a53_caption);
- s1->a53_caption_size = cc_count * 3;
- s1->a53_caption = av_mallocz(s1->a53_caption_size);
- if (!s1->a53_caption) {
- s1->a53_caption_size = 0;
- } else {
+ int old_size = s1->a53_buf_ref ? s1->a53_buf_ref->size : 0;
+ const uint64_t new_size = (old_size + cc_count
+ * UINT64_C(3));
+ if (new_size > INT_MAX)
+ return AVERROR(EINVAL);
+
+ ret = av_buffer_realloc(&s1->a53_buf_ref, new_size);
+ if (ret >= 0) {
uint8_t field, cc1, cc2;
- uint8_t *cap = s1->a53_caption;
+ uint8_t *cap = s1->a53_buf_ref->data;
+
+ memset(s1->a53_buf_ref->data + old_size, 0, cc_count * 3);
for (i = 0; i < cc_count && get_bits_left(&gb) >= 26; i++) {
skip_bits(&gb, 2); // priority
field = get_bits(&gb, 2);
* on the even field. There also exist DVDs in the wild that encode an odd field count and the
* caption_extra_field_added/caption_odd_field_first bits change per packet to allow that. */
int cc_count = 0;
- int i;
+ int i, ret;
// There is a caption count field in the data, but it is often
// incorrect. So count the number of captions present.
for (i = 5; i + 6 <= buf_size && ((p[i] & 0xfe) == 0xfe); i += 6)
cc_count++;
// Transform the DVD format into A53 Part 4 format
if (cc_count > 0) {
- av_freep(&s1->a53_caption);
- s1->a53_caption_size = cc_count * 6;
- s1->a53_caption = av_malloc(s1->a53_caption_size);
- if (!s1->a53_caption) {
- s1->a53_caption_size = 0;
- } else {
+ int old_size = s1->a53_buf_ref ? s1->a53_buf_ref->size : 0;
+ const uint64_t new_size = (old_size + cc_count
+ * UINT64_C(6));
+ if (new_size > INT_MAX)
+ return AVERROR(EINVAL);
+
+ ret = av_buffer_realloc(&s1->a53_buf_ref, new_size);
+ if (ret >= 0) {
uint8_t field1 = !!(p[4] & 0x80);
- uint8_t *cap = s1->a53_caption;
+ uint8_t *cap = s1->a53_buf_ref->data;
p += 5;
for (i = 0; i < cc_count; i++) {
cap[0] = (p[0] == 0xff && field1) ? 0xfc : 0xfd;
return ret;
else if (ret) {
// FIXME: merge with the stuff in mpeg_decode_slice
- if (s2->last_picture_ptr || s2->low_delay)
+ if (s2->last_picture_ptr || s2->low_delay || s2->pict_type == AV_PICTURE_TYPE_B)
*got_output = 1;
}
}
s2->current_picture_ptr = NULL;
if (s2->timecode_frame_start != -1 && *got_output) {
+ char tcbuf[AV_TIMECODE_STR_SIZE];
AVFrameSideData *tcside = av_frame_new_side_data(picture,
AV_FRAME_DATA_GOP_TIMECODE,
sizeof(int64_t));
return AVERROR(ENOMEM);
memcpy(tcside->data, &s2->timecode_frame_start, sizeof(int64_t));
+ av_timecode_make_mpeg_tc_string(tcbuf, s2->timecode_frame_start);
+ av_dict_set(&picture->metadata, "timecode", tcbuf, 0);
+
s2->timecode_frame_start = -1;
}
}
{
Mpeg1Context *s = avctx->priv_data;
- if (s->mpeg_enc_ctx_allocated)
- ff_mpv_common_end(&s->mpeg_enc_ctx);
- av_freep(&s->a53_caption);
+ ff_mpv_common_end(&s->mpeg_enc_ctx);
+ av_buffer_unref(&s->a53_buf_ref);
return 0;
}
.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 |
AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY |
AV_CODEC_CAP_SLICE_THREADS,
- .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
+ .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_CLEANUP,
.flush = flush,
.max_lowres = 3,
.update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg_decode_update_thread_context),
.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 |
AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY |
AV_CODEC_CAP_SLICE_THREADS,
- .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
+ .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_CLEANUP,
.flush = flush,
.max_lowres = 3,
.profiles = NULL_IF_CONFIG_SMALL(ff_mpeg2_video_profiles),
.close = mpeg_decode_end,
.decode = mpeg_decode_frame,
.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS,
- .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
+ .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_CLEANUP,
.flush = flush,
.max_lowres = 3,
};
projects / ffmpeg / blobdiff