diff --git a/ffmpeg.c b/ffmpeg.c
index db2066a42bb1fc26a27e18022356ae369d6a2f7e..098bab6e091a9f0e46ed1eedf69d9e575fe56d81 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -476,7 +476,7 @@ static void reset_options(OptionsContext *o, int is_input)
init_opts();
}
-static int alloc_buffer(AVCodecContext *s, InputStream *ist, FrameBuffer **pbuf)
+static int alloc_buffer(InputStream *ist, AVCodecContext *s, FrameBuffer **pbuf)
{
FrameBuffer *buf = av_mallocz(sizeof(*buf));
int i, ret;
@@ -556,7 +556,7 @@ static int codec_get_buffer(AVCodecContext *s, AVFrame *frame)
if(av_image_check_size(s->width, s->height, 0, s) || s->pix_fmt<0)
return -1;
- if (!ist->buffer_pool && (ret = alloc_buffer(s, ist, &ist->buffer_pool)) < 0)
+ if (!ist->buffer_pool && (ret = alloc_buffer(ist, s, &ist->buffer_pool)) < 0)
return ret;
buf = ist->buffer_pool;
@@ -566,7 +566,7 @@ static int codec_get_buffer(AVCodecContext *s, AVFrame *frame)
av_freep(&buf->base[0]);
av_free(buf);
ist->dr1 = 0;
- if ((ret = alloc_buffer(s, ist, &buf)) < 0)
+ if ((ret = alloc_buffer(ist, s, &buf)) < 0)
return ret;
}
buf->refcount++;
@@ -575,6 +575,10 @@ static int codec_get_buffer(AVCodecContext *s, AVFrame *frame)
frame->type = FF_BUFFER_TYPE_USER;
frame->extended_data = frame->data;
frame->pkt_pts = s->pkt ? s->pkt->pts : AV_NOPTS_VALUE;
+ frame->width = buf->w;
+ frame->height = buf->h;
+ frame->format = buf->pix_fmt;
+ frame->sample_aspect_ratio = s->sample_aspect_ratio;
for (i = 0; i < FF_ARRAY_ELEMS(buf->data); i++) {
frame->base[i] = buf->base[i]; // XXX h264.c uses base though it shouldn't
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index d8f8858c1e27fcaa009f92222e7696d5ce7c6a28..e155f7368038c22597bea066be5311d49a815dbd 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -646,10 +646,6 @@ int ff_thread_decode_frame(AVCodecContext *avctx,
*picture = p->frame;
*got_picture_ptr = p->got_frame;
picture->pkt_dts = p->avpkt.dts;
- picture->sample_aspect_ratio = avctx->sample_aspect_ratio;
- picture->width = avctx->width;
- picture->height = avctx->height;
- picture->format = avctx->pix_fmt;
/*
* A later call with avkpt->size == 0 may loop over all threads,
@@ -995,6 +991,10 @@ int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f)
ff_thread_finish_setup(avctx);
}
+ if (err) {
+ free_progress(f);
+ f->thread_opaque = NULL;
+ }
pthread_mutex_unlock(&p->parent->buffer_mutex);
return err;
diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c
index 38e7e69cb79467656aa183bad41744e0dfe694ed..0e5b04663fad932e4818fcc39d6b365eae851d9d 100644
--- a/libavcodec/ralf.c
+++ b/libavcodec/ralf.c
@@ -80,17 +80,17 @@ static int init_ralf_vlc(VLC *vlc, const uint8_t *data, int elems)
int counts[17], prefixes[18];
int i, cur_len;
int max_bits = 0;
- GetBitContext gb;
-
- init_get_bits(&gb, data, elems * 4);
+ int nb = 0;
for (i = 0; i <= 16; i++)
counts[i] = 0;
for (i = 0; i < elems; i++) {
- cur_len = get_bits(&gb, 4) + 1;
+ cur_len = (nb ? *data & 0xF : *data >> 4) + 1;
counts[cur_len]++;
max_bits = FFMAX(max_bits, cur_len);
lens[i] = cur_len;
+ data += nb;
+ nb ^= 1;
}
prefixes[1] = 0;
for (i = 1; i <= 16; i++)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 58435d43aa1c673134589f664ccbde70ab7dc42f..9c662c2ba3c3bd5aa6b7e8b5e65f14339f74ce02 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -425,11 +425,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
buf = &avci->buffer[avci->buffer_count];
if(buf->base[0] && (buf->width != w || buf->height != h || buf->pix_fmt != s->pix_fmt)){
- if(s->active_thread_type&FF_THREAD_FRAME) {
- av_log_missing_feature(s, "Width/height changing with frame threads is", 0);
- return -1;
- }
-
for (i = 0; i < AV_NUM_DATA_POINTERS; i++) {
av_freep(&buf->base[i]);
buf->data[i]= NULL;
@@ -513,6 +508,10 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
}
pic->extended_data = pic->data;
avci->buffer_count++;
+ pic->width = buf->width;
+ pic->height = buf->height;
+ pic->format = buf->pix_fmt;
+ pic->sample_aspect_ratio = s->sample_aspect_ratio;
if (s->pkt) {
pic->pkt_pts = s->pkt->pts;
diff --git a/libavcodec/utvideo.c b/libavcodec/utvideo.c
index cadac5c3f32a2f7f355c8626ef9761138f242661..cdc688da22b38cfcdc816b03b2980716d58cb0a1 100644
--- a/libavcodec/utvideo.c
+++ b/libavcodec/utvideo.c
@@ -490,6 +490,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
break;
}
+ c->pic.key_frame = 1;
+ c->pic.pict_type = AV_PICTURE_TYPE_I;
*data_size = sizeof(AVFrame);
*(AVFrame*)data = c->pic;
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 9b12aa8908b581f66fd2b18dde621c85a69498c4..a7a1512b89e9c0b1eb267802584b3804e6485354 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -162,11 +162,23 @@ static void update_lf_deltas(VP8Context *s)
VP56RangeCoder *c = &s->c;
int i;
- for (i = 0; i < 4; i++)
- s->lf_delta.ref[i] = vp8_rac_get_sint(c, 6);
+ for (i = 0; i < 4; i++) {
+ if (vp8_rac_get(c)) {
+ s->lf_delta.ref[i] = vp8_rac_get_uint(c, 6);
+
+ if (vp8_rac_get(c))
+ s->lf_delta.ref[i] = -s->lf_delta.ref[i];
+ }
+ }
+
+ for (i = MODE_I4x4; i <= VP8_MVMODE_SPLIT; i++) {
+ if (vp8_rac_get(c)) {
+ s->lf_delta.mode[i] = vp8_rac_get_uint(c, 6);
- for (i = MODE_I4x4; i <= VP8_MVMODE_SPLIT; i++)
- s->lf_delta.mode[i] = vp8_rac_get_sint(c, 6);
+ if (vp8_rac_get(c))
+ s->lf_delta.mode[i] = -s->lf_delta.mode[i];
+ }
+ }
}
static int setup_partitions(VP8Context *s, const uint8_t *buf, int buf_size)
diff --git a/libavformat/avc.c b/libavformat/avc.c
index eff1ddb1213a22253d0a2536a34b0aaeb307cada..f5c513bb310864288c3764e01a81a6cfb0a4e5ee 100644
--- a/libavformat/avc.c
+++ b/libavformat/avc.c
@@ -160,3 +160,34 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len)
}
return 0;
}
+
+int ff_avc_write_annexb_extradata(const uint8_t *in, uint8_t **buf, int *size)
+{
+ uint16_t sps_size, pps_size;
+ uint8_t *out;
+ int out_size;
+
+ *buf = NULL;
+ if (*size >= 4 && (AV_RB32(in) == 0x00000001 || AV_RB24(in) == 0x000001))
+ return 0;
+ if (*size < 11 || in[0] != 1)
+ return AVERROR_INVALIDDATA;
+
+ sps_size = AV_RB16(&in[6]);
+ if (11 + sps_size > *size)
+ return AVERROR_INVALIDDATA;
+ pps_size = AV_RB16(&in[9 + sps_size]);
+ if (11 + sps_size + pps_size > *size)
+ return AVERROR_INVALIDDATA;
+ out_size = 8 + sps_size + pps_size;
+ out = av_mallocz(out_size);
+ if (!out)
+ return AVERROR(ENOMEM);
+ AV_WB32(&out[0], 0x00000001);
+ memcpy(out + 4, &in[8], sps_size);
+ AV_WB32(&out[4 + sps_size], 0x00000001);
+ memcpy(out + 8 + sps_size, &in[11 + sps_size], pps_size);
+ *buf = out;
+ *size = out_size;
+ return 0;
+}
diff --git a/libavformat/avc.h b/libavformat/avc.h
index 46e5e37a54115e1ffa5fc160813204f475d2fbce..972e19b94a4ba1bac9c205ec368493552e5b3b5f 100644
--- a/libavformat/avc.h
+++ b/libavformat/avc.h
@@ -29,5 +29,6 @@ int ff_avc_parse_nal_units(AVIOContext *s, const uint8_t *buf, int size);
int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size);
int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len);
const uint8_t *ff_avc_find_startcode(const uint8_t *p, const uint8_t *end);
+int ff_avc_write_annexb_extradata(const uint8_t *in, uint8_t **buf, int *size);
#endif /* AVFORMAT_AVC_H */
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index e49e475e554ae32be036dea005aec5e2b6df01f4..36b874ba15875046306b5bf03e7b77eb659ee2c6 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -558,7 +558,12 @@ typedef struct AVIndexEntry {
*/
typedef struct AVStream {
int index; /**< stream index in AVFormatContext */
- int id; /**< format-specific stream ID */
+ /**
+ * Format-specific stream ID.
+ * decoding: set by libavformat
+ * encoding: set by the user
+ */
+ int id;
AVCodecContext *codec; /**< codec context */
/**
* Real base framerate of the stream.
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 0b4ccbf2575293bacf800c9b1571114431ca5d53..9a8c38d097cc6e3c94855606d9862d7d9ae33b09 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -2158,26 +2158,6 @@ static void param_write_hex(AVIOContext *pb, const char *name, const uint8_t *va
avio_printf(pb, "<param name=\"%s\" value=\"%s\" valuetype=\"data\"/>\n", name, buf);
}
-static void write_h264_extradata(AVIOContext *pb, AVCodecContext *enc)
-{
- uint16_t sps_size, pps_size, len;
- char buf[150];
- sps_size = AV_RB16(&enc->extradata[6]);
- if (11 + sps_size > enc->extradata_size)
- return;
- pps_size = AV_RB16(&enc->extradata[9 + sps_size]);
- if (11 + sps_size + pps_size > enc->extradata_size)
- return;
- len = FFMIN(sizeof(buf)/2 - 1, sps_size);
- ff_data_to_hex(buf, &enc->extradata[8], len, 0);
- buf[2*len] = '\0';
- avio_printf(pb, "<param name=\"CodecPrivateData\" value=\"00000001%s", buf);
- len = FFMIN(sizeof(buf)/2 - 1, pps_size);
- ff_data_to_hex(buf, &enc->extradata[11 + sps_size], len, 0);
- buf[2*len] = '\0';
- avio_printf(pb, "00000001%s\" valuetype=\"data\"/>\n", buf);
-}
-
static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov)
{
int64_t pos = avio_tell(pb);
@@ -2219,10 +2199,16 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov)
param_write_int(pb, "systemBitrate", track->enc->bit_rate);
param_write_int(pb, "trackID", track_id);
if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) {
- if (track->enc->codec_id == CODEC_ID_H264 &&
- track->enc->extradata_size >= 11 &&
- track->enc->extradata[0] == 1) {
- write_h264_extradata(pb, track->enc);
+ if (track->enc->codec_id == CODEC_ID_H264) {
+ uint8_t *ptr;
+ int size = track->enc->extradata_size;
+ if (!ff_avc_write_annexb_extradata(track->enc->extradata, &ptr,
+ &size)) {
+ param_write_hex(pb, "CodecPrivateData",
+ ptr ? ptr : track->enc->extradata,
+ size);
+ av_free(ptr);
+ }
} else {
param_write_hex(pb, "CodecPrivateData", track->enc->extradata,
track->enc->extradata_size);