summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/dfa.c163
-rw-r--r--libavcodec/h264.c4
-rw-r--r--libavcodec/h264_direct.c6
-rw-r--r--libavcodec/h264_ps.c5
-rw-r--r--libavcodec/libx264.c8
5 files changed, 88 insertions, 98 deletions
diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c
index 97c0954422..2e68976c1f 100644
--- a/libavcodec/dfa.c
+++ b/libavcodec/dfa.c
@@ -21,7 +21,6 @@
*/
#include "avcodec.h"
-#include "libavutil/intreadwrite.h"
#include "bytestream.h"
#include "libavutil/lzo.h" // for av_memcpy_backptr
@@ -45,19 +44,16 @@ static av_cold int dfa_decode_init(AVCodecContext *avctx)
return 0;
}
-static int decode_copy(uint8_t *frame, int width, int height,
- const uint8_t *src, const uint8_t *src_end)
+static int decode_copy(GetByteContext *gb, uint8_t *frame, int width, int height)
{
const int size = width * height;
- if (src_end - src < size)
+ if (bytestream2_get_buffer(gb, frame, size) != size)
return -1;
- bytestream_get_buffer(&src, frame, size);
return 0;
}
-static int decode_tsw1(uint8_t *frame, int width, int height,
- const uint8_t *src, const uint8_t *src_end)
+static int decode_tsw1(GetByteContext *gb, uint8_t *frame, int width, int height)
{
const uint8_t *frame_start = frame;
const uint8_t *frame_end = frame + width * height;
@@ -65,24 +61,24 @@ static int decode_tsw1(uint8_t *frame, int width, int height,
int v, count, segments;
unsigned offset;
- segments = bytestream_get_le32(&src);
- offset = bytestream_get_le32(&src);
+ segments = bytestream2_get_le32(gb);
+ offset = bytestream2_get_le32(gb);
if (segments == 0 && offset == frame_end - frame)
return 0; // skip frame
if (frame_end - frame <= offset)
return -1;
frame += offset;
while (segments--) {
+ if (bytestream2_get_bytes_left(gb) < 2)
+ return -1;
if (mask == 0x10000) {
- if (src >= src_end)
- return -1;
- bitbuf = bytestream_get_le16(&src);
+ bitbuf = bytestream2_get_le16u(gb);
mask = 1;
}
- if (src_end - src < 2 || frame_end - frame < 2)
+ if (frame_end - frame < 2)
return -1;
if (bitbuf & mask) {
- v = bytestream_get_le16(&src);
+ v = bytestream2_get_le16(gb);
offset = (v & 0x1FFF) << 1;
count = ((v >> 13) + 2) << 1;
if (frame - frame_start < offset || frame_end - frame < count)
@@ -90,8 +86,8 @@ static int decode_tsw1(uint8_t *frame, int width, int height,
av_memcpy_backptr(frame, offset, count);
frame += count;
} else {
- *frame++ = *src++;
- *frame++ = *src++;
+ *frame++ = bytestream2_get_byte(gb);
+ *frame++ = bytestream2_get_byte(gb);
}
mask <<= 1;
}
@@ -99,26 +95,25 @@ static int decode_tsw1(uint8_t *frame, int width, int height,
return 0;
}
-static int decode_dsw1(uint8_t *frame, int width, int height,
- const uint8_t *src, const uint8_t *src_end)
+static int decode_dsw1(GetByteContext *gb, uint8_t *frame, int width, int height)
{
const uint8_t *frame_start = frame;
const uint8_t *frame_end = frame + width * height;
int mask = 0x10000, bitbuf = 0;
int v, offset, count, segments;
- segments = bytestream_get_le16(&src);
+ segments = bytestream2_get_le16(gb);
while (segments--) {
+ if (bytestream2_get_bytes_left(gb) < 2)
+ return -1;
if (mask == 0x10000) {
- if (src >= src_end)
- return -1;
- bitbuf = bytestream_get_le16(&src);
+ bitbuf = bytestream2_get_le16u(gb);
mask = 1;
}
- if (src_end - src < 2 || frame_end - frame < 2)
+ if (frame_end - frame < 2)
return -1;
if (bitbuf & mask) {
- v = bytestream_get_le16(&src);
+ v = bytestream2_get_le16(gb);
offset = (v & 0x1FFF) << 1;
count = ((v >> 13) + 2) << 1;
if (frame - frame_start < offset || frame_end - frame < count)
@@ -128,10 +123,10 @@ static int decode_dsw1(uint8_t *frame, int width, int height,
frame[v] = frame[v - offset];
frame += count;
} else if (bitbuf & (mask << 1)) {
- frame += bytestream_get_le16(&src);
+ frame += bytestream2_get_le16(gb);
} else {
- *frame++ = *src++;
- *frame++ = *src++;
+ *frame++ = bytestream2_get_byte(gb);
+ *frame++ = bytestream2_get_byte(gb);
}
mask <<= 2;
}
@@ -139,26 +134,25 @@ static int decode_dsw1(uint8_t *frame, int width, int height,
return 0;
}
-static int decode_dds1(uint8_t *frame, int width, int height,
- const uint8_t *src, const uint8_t *src_end)
+static int decode_dds1(GetByteContext *gb, uint8_t *frame, int width, int height)
{
const uint8_t *frame_start = frame;
const uint8_t *frame_end = frame + width * height;
int mask = 0x10000, bitbuf = 0;
int i, v, offset, count, segments;
- segments = bytestream_get_le16(&src);
+ segments = bytestream2_get_le16(gb);
while (segments--) {
+ if (bytestream2_get_bytes_left(gb) < 2)
+ return -1;
if (mask == 0x10000) {
- if (src >= src_end)
- return -1;
- bitbuf = bytestream_get_le16(&src);
+ bitbuf = bytestream2_get_le16u(gb);
mask = 1;
}
- if (src_end - src < 2 || frame_end - frame < 2)
+ if (frame_end - frame < 2)
return -1;
if (bitbuf & mask) {
- v = bytestream_get_le16(&src);
+ v = bytestream2_get_le16(gb);
offset = (v & 0x1FFF) << 2;
count = ((v >> 13) + 2) << 1;
if (frame - frame_start < offset || frame_end - frame < count*2 + width)
@@ -170,13 +164,13 @@ static int decode_dds1(uint8_t *frame, int width, int height,
frame += 2;
}
} else if (bitbuf & (mask << 1)) {
- frame += bytestream_get_le16(&src) * 2;
+ frame += bytestream2_get_le16(gb) * 2;
} else {
frame[0] = frame[1] =
- frame[width] = frame[width + 1] = *src++;
+ frame[width] = frame[width + 1] = bytestream2_get_byte(gb);
frame += 2;
frame[0] = frame[1] =
- frame[width] = frame[width + 1] = *src++;
+ frame[width] = frame[width + 1] = bytestream2_get_byte(gb);
frame += 2;
}
mask <<= 2;
@@ -185,40 +179,40 @@ static int decode_dds1(uint8_t *frame, int width, int height,
return 0;
}
-static int decode_bdlt(uint8_t *frame, int width, int height,
- const uint8_t *src, const uint8_t *src_end)
+static int decode_bdlt(GetByteContext *gb, uint8_t *frame, int width, int height)
{
uint8_t *line_ptr;
int count, lines, segments;
- count = bytestream_get_le16(&src);
+ count = bytestream2_get_le16(gb);
if (count >= height)
return -1;
frame += width * count;
- lines = bytestream_get_le16(&src);
- if (count + lines > height || src >= src_end)
+ lines = bytestream2_get_le16(gb);
+ if (count + lines > height)
return -1;
while (lines--) {
+ if (bytestream2_get_bytes_left(gb) < 1)
+ return -1;
line_ptr = frame;
frame += width;
- segments = *src++;
+ segments = bytestream2_get_byteu(gb);
while (segments--) {
- if (src_end - src < 3)
+ if (frame - line_ptr <= bytestream2_peek_byte(gb))
return -1;
- if (frame - line_ptr <= *src)
- return -1;
- line_ptr += *src++;
- count = (int8_t)*src++;
+ line_ptr += bytestream2_get_byte(gb);
+ count = (int8_t)bytestream2_get_byte(gb);
if (count >= 0) {
- if (frame - line_ptr < count || src_end - src < count)
+ if (frame - line_ptr < count)
+ return -1;
+ if (bytestream2_get_buffer(gb, line_ptr, count) != count)
return -1;
- bytestream_get_buffer(&src, line_ptr, count);
} else {
count = -count;
- if (frame - line_ptr < count || src >= src_end)
+ if (frame - line_ptr < count)
return -1;
- memset(line_ptr, *src++, count);
+ memset(line_ptr, bytestream2_get_byte(gb), count);
}
line_ptr += count;
}
@@ -227,49 +221,49 @@ static int decode_bdlt(uint8_t *frame, int width, int height,
return 0;
}
-static int decode_wdlt(uint8_t *frame, int width, int height,
- const uint8_t *src, const uint8_t *src_end)
+static int decode_wdlt(GetByteContext *gb, uint8_t *frame, int width, int height)
{
const uint8_t *frame_end = frame + width * height;
uint8_t *line_ptr;
int count, i, v, lines, segments;
- lines = bytestream_get_le16(&src);
- if (lines > height || src >= src_end)
+ lines = bytestream2_get_le16(gb);
+ if (lines > height)
return -1;
while (lines--) {
- segments = bytestream_get_le16(&src);
+ if (bytestream2_get_bytes_left(gb) < 2)
+ return -1;
+ segments = bytestream2_get_le16u(gb);
while ((segments & 0xC000) == 0xC000) {
unsigned delta = -((int16_t)segments * width);
if (frame_end - frame <= delta)
return -1;
frame += delta;
- segments = bytestream_get_le16(&src);
+ segments = bytestream2_get_le16(gb);
}
if (segments & 0x8000) {
frame[width - 1] = segments & 0xFF;
- segments = bytestream_get_le16(&src);
+ segments = bytestream2_get_le16(gb);
}
line_ptr = frame;
frame += width;
while (segments--) {
- if (src_end - src < 2)
- return -1;
- if (frame - line_ptr <= *src)
+ if (frame - line_ptr <= bytestream2_peek_byte(gb))
return -1;
- line_ptr += *src++;
- count = (int8_t)*src++;
+ line_ptr += bytestream2_get_byte(gb);
+ count = (int8_t)bytestream2_get_byte(gb);
if (count >= 0) {
- if (frame - line_ptr < count*2 || src_end - src < count*2)
+ if (frame - line_ptr < count * 2)
+ return -1;
+ if (bytestream2_get_buffer(gb, line_ptr, count * 2) != count * 2)
return -1;
- bytestream_get_buffer(&src, line_ptr, count*2);
line_ptr += count * 2;
} else {
count = -count;
- if (frame - line_ptr < count*2 || src_end - src < 2)
+ if (frame - line_ptr < count * 2)
return -1;
- v = bytestream_get_le16(&src);
+ v = bytestream2_get_le16(gb);
for (i = 0; i < count; i++)
bytestream_put_le16(&line_ptr, v);
}
@@ -279,22 +273,19 @@ static int decode_wdlt(uint8_t *frame, int width, int height,
return 0;
}
-static int decode_unk6(uint8_t *frame, int width, int height,
- const uint8_t *src, const uint8_t *src_end)
+static int decode_unk6(GetByteContext *gb, uint8_t *frame, int width, int height)
{
return -1;
}
-static int decode_blck(uint8_t *frame, int width, int height,
- const uint8_t *src, const uint8_t *src_end)
+static int decode_blck(GetByteContext *gb, uint8_t *frame, int width, int height)
{
memset(frame, 0, width * height);
return 0;
}
-typedef int (*chunk_decoder)(uint8_t *frame, int width, int height,
- const uint8_t *src, const uint8_t *src_end);
+typedef int (*chunk_decoder)(GetByteContext *gb, uint8_t *frame, int width, int height);
static const chunk_decoder decoder[8] = {
decode_copy, decode_tsw1, decode_bdlt, decode_wdlt,
@@ -310,9 +301,8 @@ static int dfa_decode_frame(AVCodecContext *avctx,
AVPacket *avpkt)
{
DfaContext *s = avctx->priv_data;
+ GetByteContext gb;
const uint8_t *buf = avpkt->data;
- const uint8_t *buf_end = avpkt->data + avpkt->size;
- const uint8_t *tmp_buf;
uint32_t chunk_type, chunk_size;
uint8_t *dst;
int ret;
@@ -326,27 +316,22 @@ static int dfa_decode_frame(AVCodecContext *avctx,
return ret;
}
- while (buf < buf_end) {
- chunk_size = AV_RL32(buf + 4);
- chunk_type = AV_RL32(buf + 8);
- buf += 12;
- if (buf_end - buf < chunk_size) {
- av_log(avctx, AV_LOG_ERROR, "Chunk size is too big (%d bytes)\n", chunk_size);
- return -1;
- }
+ bytestream2_init(&gb, avpkt->data, avpkt->size);
+ while (bytestream2_get_bytes_left(&gb) > 0) {
+ bytestream2_skip(&gb, 4);
+ chunk_size = bytestream2_get_le32(&gb);
+ chunk_type = bytestream2_get_le32(&gb);
if (!chunk_type)
break;
if (chunk_type == 1) {
pal_elems = FFMIN(chunk_size / 3, 256);
- tmp_buf = buf;
for (i = 0; i < pal_elems; i++) {
- s->pal[i] = bytestream_get_be24(&tmp_buf) << 2;
+ s->pal[i] = bytestream2_get_be24(&gb) << 2;
s->pal[i] |= 0xFF << 24 | (s->pal[i] >> 6) & 0x30303;
}
s->pic.palette_has_changed = 1;
} else if (chunk_type <= 9) {
- if (decoder[chunk_type - 2](s->frame_buf, avctx->width, avctx->height,
- buf, buf + chunk_size)) {
+ if (decoder[chunk_type - 2](&gb, s->frame_buf, avctx->width, avctx->height)) {
av_log(avctx, AV_LOG_ERROR, "Error decoding %s chunk\n",
chunk_name[chunk_type - 2]);
return -1;
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 7f09154128..2cb56028de 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3967,10 +3967,10 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
break;
case NAL_SPS:
init_get_bits(&s->gb, ptr, bit_length);
- if(ff_h264_decode_seq_parameter_set(h) < 0 && (h->is_avc ? (nalsize != consumed) && nalsize : 1)){
+ if (ff_h264_decode_seq_parameter_set(h) < 0 && (h->is_avc ? (nalsize != consumed) && nalsize : 1)){
av_log(h->s.avctx, AV_LOG_DEBUG, "SPS decoding failure, trying alternative mode\n");
if(h->is_avc) av_assert0(next_avc - buf_index + consumed == nalsize);
- init_get_bits(&s->gb, &buf[buf_index + 1 - consumed], 8*(next_avc - buf_index + consumed));
+ init_get_bits(&s->gb, &buf[buf_index + 1 - consumed], 8*(next_avc - buf_index + consumed - 1));
ff_h264_decode_seq_parameter_set(h);
}
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 263832d829..ce395a3c56 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -254,7 +254,7 @@ static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy + s->mb_stride];
b8_stride = 2+4*s->mb_stride;
b4_stride *= 6;
- if(IS_INTERLACED(mb_type_col[0]) != IS_INTERLACED(mb_type_col[1])){
+ if (IS_INTERLACED(mb_type_col[0]) != IS_INTERLACED(mb_type_col[1])) {
mb_type_col[0] &= ~MB_TYPE_INTERLACED;
mb_type_col[1] &= ~MB_TYPE_INTERLACED;
}
@@ -444,6 +444,10 @@ static void pred_temp_direct_motion(H264Context * const h, int *mb_type){
mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy + s->mb_stride];
b8_stride = 2+4*s->mb_stride;
b4_stride *= 6;
+ if (IS_INTERLACED(mb_type_col[0]) != IS_INTERLACED(mb_type_col[1])) {
+ mb_type_col[0] &= ~MB_TYPE_INTERLACED;
+ mb_type_col[1] &= ~MB_TYPE_INTERLACED;
+ }
sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index e56a7160e1..9c39af1f17 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -251,9 +251,10 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps){
return -1;
}
}
- if(get_bits_left(&s->gb) < 0){
+
+ if (get_bits_left(&s->gb) < 0) {
av_log(h->s.avctx, AV_LOG_ERROR, "Overread VUI by %d bits\n", -get_bits_left(&s->gb));
- return -1;
+ return AVERROR_INVALIDDATA;
}
return 0;
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 3d503dbfc7..fa9188debf 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -43,7 +43,6 @@ typedef struct X264Context {
char *profile;
char *level;
int fastfirstpass;
- char *stats;
char *wpredp;
char *x264opts;
float crf;
@@ -70,6 +69,7 @@ typedef struct X264Context {
char *partitions;
int direct_pred;
int slice_max_size;
+ char *stats;
} X264Context;
static void X264_log(void *p, int level, const char *fmt, va_list args)
@@ -323,8 +323,6 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.rc.f_rf_constant_max = x4->crf_max;
}
- OPT_STR("stats", x4->stats);
-
if (avctx->rc_buffer_size && avctx->rc_initial_buffer_occupancy &&
(avctx->rc_initial_buffer_occupancy <= avctx->rc_buffer_size)) {
x4->params.rc.f_vbv_buffer_init =
@@ -399,6 +397,7 @@ static av_cold int X264_init(AVCodecContext *avctx)
PARSE_X264_OPT("psy-rd", psy_rd);
PARSE_X264_OPT("deblock", deblock);
PARSE_X264_OPT("partitions", partitions);
+ PARSE_X264_OPT("stats", stats);
if (x4->psy >= 0)
x4->params.analyse.b_psy = x4->psy;
if (x4->rc_lookahead >= 0)
@@ -592,7 +591,8 @@ static const AVOption options[] = {
{ "spatial", NULL, 0, AV_OPT_TYPE_CONST, { X264_DIRECT_PRED_SPATIAL }, 0, 0, VE, "direct-pred" },
{ "temporal", NULL, 0, AV_OPT_TYPE_CONST, { X264_DIRECT_PRED_TEMPORAL }, 0, 0, VE, "direct-pred" },
{ "auto", NULL, 0, AV_OPT_TYPE_CONST, { X264_DIRECT_PRED_AUTO }, 0, 0, VE, "direct-pred" },
- { "slice-max-size","Constant quantization parameter rate control method",OFFSET(slice_max_size), AV_OPT_TYPE_INT, {-1 }, -1, INT_MAX, VE },
+ { "slice-max-size","Limit the size of each slice in bytes", OFFSET(slice_max_size),AV_OPT_TYPE_INT, {-1 }, -1, INT_MAX, VE },
+ { "stats", "Filename for 2 pass stats", OFFSET(stats), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
{ NULL },
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 16:27:13 +0000