generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be'

Browse Source 
* commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be':
  dxtory: Factorize the buffer loading

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-08 14:27:05 +02:00
commit aa15e233c4
1 changed files with 37 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
libavcodec/dxtory.c
View File

@ -220,6 +220,28 @@ static int check_slice_size(AVCodecContext *avctx,
return 0; return 0;
} }
static int load_buffer(AVCodecContext *avctx,
const uint8_t *src, int src_size,
GetByteContext *gb,
int *nslices, int *off)
{
bytestream2_init(gb, src, src_size);
*nslices = bytestream2_get_le16(gb);
*off = FFALIGN(*nslices * 4 + 2, 16);
if (src_size < *off) {
av_log(avctx, AV_LOG_ERROR, "no slice data\n");
return AVERROR_INVALIDDATA;
}
if (!*nslices) {
avpriv_request_sample(avctx, "%d slices for %dx%d", *nslices,
avctx->width, avctx->height);
return AVERROR_PATCHWELCOME;
}
return 0;
}
static inline uint8_t decode_sym_565(GetBitContext *gb, uint8_t lru[8], static inline uint8_t decode_sym_565(GetBitContext *gb, uint8_t lru[8],
int bits) int bits)
{ {
@ -275,19 +297,9 @@ static int dxtory_decode_v2_565(AVCodecContext *avctx, AVFrame *pic,
uint8_t *dst; uint8_t *dst;
int ret; int ret;
bytestream2_init(&gb, src, src_size); ret = load_buffer(avctx, src, src_size, &gb, &nslices, &off);
nslices = bytestream2_get_le16(&gb); if (ret < 0)
off = FFALIGN(nslices * 4 + 2, 16); return ret;
if (src_size < off) {
av_log(avctx, AV_LOG_ERROR, "no slice data\n");
return AVERROR_INVALIDDATA;
}
if (!nslices || avctx->height % nslices) {
avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
avctx->width, avctx->height);
return AVERROR_PATCHWELCOME;
}
slice_height = avctx->height / nslices; slice_height = avctx->height / nslices;
avctx->pix_fmt = AV_PIX_FMT_RGB24; avctx->pix_fmt = AV_PIX_FMT_RGB24;
@ -346,19 +358,9 @@ static int dxtory_decode_v2_rgb(AVCodecContext *avctx, AVFrame *pic,
uint8_t *dst; uint8_t *dst;
int ret; int ret;
bytestream2_init(&gb, src, src_size); ret = load_buffer(avctx, src, src_size, &gb, &nslices, &off);
nslices = bytestream2_get_le16(&gb); if (ret < 0)
off = FFALIGN(nslices * 4 + 2, 16); return ret;
if (src_size < off) {
av_log(avctx, AV_LOG_ERROR, "no slice data\n");
return AVERROR_INVALIDDATA;
}
if (!nslices || avctx->height % nslices) {
avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
avctx->width, avctx->height);
return AVERROR_PATCHWELCOME;
}
slice_height = avctx->height / nslices; slice_height = avctx->height / nslices;
avctx->pix_fmt = AV_PIX_FMT_BGR24; avctx->pix_fmt = AV_PIX_FMT_BGR24;
@ -423,19 +425,9 @@ static int dxtory_decode_v2_410(AVCodecContext *avctx, AVFrame *pic,
uint8_t *Y, *U, *V; uint8_t *Y, *U, *V;
int ret; int ret;
bytestream2_init(&gb, src, src_size); ret = load_buffer(avctx, src, src_size, &gb, &nslices, &off);
nslices = bytestream2_get_le16(&gb); if (ret < 0)
off = FFALIGN(nslices * 4 + 2, 16); return ret;
if (src_size < off) {
av_log(avctx, AV_LOG_ERROR, "no slice data\n");
return AVERROR_INVALIDDATA;
}
if (!nslices) {
avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
avctx->width, avctx->height);
return AVERROR_PATCHWELCOME;
}
if ((avctx->width & 3) || (avctx->height & 3)) { if ((avctx->width & 3) || (avctx->height & 3)) {
avpriv_request_sample(avctx, "Frame dimensions %dx%d", avpriv_request_sample(avctx, "Frame dimensions %dx%d",
@ -516,19 +508,9 @@ static int dxtory_decode_v2_420(AVCodecContext *avctx, AVFrame *pic,
uint8_t *Y, *U, *V; uint8_t *Y, *U, *V;
int ret; int ret;
bytestream2_init(&gb, src, src_size); ret = load_buffer(avctx, src, src_size, &gb, &nslices, &off);
nslices = bytestream2_get_le16(&gb); if (ret < 0)
off = FFALIGN(nslices * 4 + 2, 16); return ret;
if (src_size < off) {
av_log(avctx, AV_LOG_ERROR, "no slice data\n");
return AVERROR_INVALIDDATA;
}
if (!nslices) {
avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
avctx->width, avctx->height);
return AVERROR_PATCHWELCOME;
}
if ((avctx->width & 1) || (avctx->height & 1)) { if ((avctx->width & 1) || (avctx->height & 1)) {
avpriv_request_sample(avctx, "Frame dimensions %dx%d", avpriv_request_sample(avctx, "Frame dimensions %dx%d",
@ -604,19 +586,9 @@ static int dxtory_decode_v2_444(AVCodecContext *avctx, AVFrame *pic,
uint8_t *Y, *U, *V; uint8_t *Y, *U, *V;
int ret; int ret;
bytestream2_init(&gb, src, src_size); ret = load_buffer(avctx, src, src_size, &gb, &nslices, &off);
nslices = bytestream2_get_le16(&gb); if (ret < 0)
off = FFALIGN(nslices * 4 + 2, 16); return ret;
if (src_size < off) {
av_log(avctx, AV_LOG_ERROR, "no slice data\n");
return AVERROR_INVALIDDATA;
}
if (!nslices || avctx->height % nslices) {
avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
avctx->width, avctx->height);
return AVERROR_PATCHWELCOME;
}
slice_height = avctx->height / nslices; slice_height = avctx->height / nslices;