Skip to content

Commit

Permalink
Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'
Browse files Browse the repository at this point in the history 
* commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b':
  yop: simplify/sanitize the decoding loop
  c93: set palette_has_changed.
  bmp: cosmetics, reformat
  hlsenc: Don't duplicate a string constant

Conflicts:
	libavcodec/bmp.c
	tests/ref/fate/yop

Merged-by: Michael Niedermayer <[email protected]>
  • Loading branch information
@michaelni
michaelni committed Dec 24, 2012
2 parents ba8e909 + c6303f8 commit 9dbedf3
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 92 deletions.
120 changes: 62 additions & 58 deletions libavcodec/bmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
#include "internal.h"
#include "msrledec.h"

static av_cold int bmp_decode_init(AVCodecContext *avctx){
static av_cold int bmp_decode_init(AVCodecContext *avctx)
{
BMPContext *s = avctx->priv_data;

avcodec_get_frame_defaults(&s->picture);
Expand All @@ -39,10 +40,10 @@ static int bmp_decode_frame(AVCodecContext *avctx,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
BMPContext *s = avctx->priv_data;
AVFrame *picture = data;
AVFrame *p = &s->picture;
int buf_size = avpkt->size;
BMPContext *s = avctx->priv_data;
AVFrame *picture = data;
AVFrame *p = &s->picture;
unsigned int fsize, hsize;
int width, height;
unsigned int depth;
Expand All @@ -56,19 +57,19 @@ static int bmp_decode_frame(AVCodecContext *avctx,
const uint8_t *buf0 = buf;
GetByteContext gb;

if(buf_size < 14){
if (buf_size < 14) {
av_log(avctx, AV_LOG_ERROR, "buf size too small (%d)\n", buf_size);
return -1;
}

if(bytestream_get_byte(&buf) != 'B' ||
bytestream_get_byte(&buf) != 'M') {
if (bytestream_get_byte(&buf) != 'B' ||
bytestream_get_byte(&buf) != 'M') {
av_log(avctx, AV_LOG_ERROR, "bad magic number\n");
return -1;
}

fsize = bytestream_get_le32(&buf);
if(buf_size < fsize){
if (buf_size < fsize) {
av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d), trying to decode anyway\n",
buf_size, fsize);
fsize = buf_size;
Expand All @@ -77,30 +78,30 @@ static int bmp_decode_frame(AVCodecContext *avctx,
buf += 2; /* reserved1 */
buf += 2; /* reserved2 */

hsize = bytestream_get_le32(&buf); /* header size */
ihsize = bytestream_get_le32(&buf); /* more header size */
if(ihsize + 14 > hsize){
hsize = bytestream_get_le32(&buf); /* header size */
ihsize = bytestream_get_le32(&buf); /* more header size */
if (ihsize + 14 > hsize) {
av_log(avctx, AV_LOG_ERROR, "invalid header size %d\n", hsize);
return -1;
}

/* sometimes file size is set to some headers size, set a real size in that case */
if(fsize == 14 || fsize == ihsize + 14)
if (fsize == 14 || fsize == ihsize + 14)
fsize = buf_size - 2;

if(fsize <= hsize){
if (fsize <= hsize) {
av_log(avctx, AV_LOG_ERROR, "declared file size is less than header size (%d < %d)\n",
fsize, hsize);
return -1;
}

switch(ihsize){
switch (ihsize) {
case 40: // windib
case 56: // windib v3
case 64: // OS/2 v2
case 108: // windib v4
case 124: // windib v5
width = bytestream_get_le32(&buf);
width = bytestream_get_le32(&buf);
height = bytestream_get_le32(&buf);
break;
case 12: // OS/2 v1
Expand All @@ -112,7 +113,8 @@ static int bmp_decode_frame(AVCodecContext *avctx,
return -1;
}

if(bytestream_get_le16(&buf) != 1){ /* planes */
/* planes */
if (bytestream_get_le16(&buf) != 1) {
av_log(avctx, AV_LOG_ERROR, "invalid BMP header\n");
return -1;
}
Expand All @@ -124,27 +126,28 @@ static int bmp_decode_frame(AVCodecContext *avctx,
else
comp = BMP_RGB;

if(comp != BMP_RGB && comp != BMP_BITFIELDS && comp != BMP_RLE4 && comp != BMP_RLE8){
if (comp != BMP_RGB && comp != BMP_BITFIELDS && comp != BMP_RLE4 &&
comp != BMP_RLE8) {
av_log(avctx, AV_LOG_ERROR, "BMP coding %d not supported\n", comp);
return -1;
}

if(comp == BMP_BITFIELDS){
if (comp == BMP_BITFIELDS) {
buf += 20;
rgb[0] = bytestream_get_le32(&buf);
rgb[1] = bytestream_get_le32(&buf);
rgb[2] = bytestream_get_le32(&buf);
alpha = bytestream_get_le32(&buf);
}

avctx->width = width;
avctx->height = height > 0? height: -height;
avctx->width = width;
avctx->height = height > 0 ? height : -height;

avctx->pix_fmt = AV_PIX_FMT_NONE;

switch(depth){
switch (depth) {
case 32:
if(comp == BMP_BITFIELDS){
if (comp == BMP_BITFIELDS) {
if (rgb[0] == 0xFF000000 && rgb[1] == 0x00FF0000 && rgb[2] == 0x0000FF00)
avctx->pix_fmt = alpha ? AV_PIX_FMT_ABGR : AV_PIX_FMT_0BGR;
else if (rgb[0] == 0x00FF0000 && rgb[1] == 0x0000FF00 && rgb[2] == 0x000000FF)
Expand All @@ -165,7 +168,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
avctx->pix_fmt = AV_PIX_FMT_BGR24;
break;
case 16:
if(comp == BMP_RGB)
if (comp == BMP_RGB)
avctx->pix_fmt = AV_PIX_FMT_RGB555;
else if (comp == BMP_BITFIELDS) {
if (rgb[0] == 0xF800 && rgb[1] == 0x07E0 && rgb[2] == 0x001F)
Expand All @@ -181,16 +184,16 @@ static int bmp_decode_frame(AVCodecContext *avctx,
}
break;
case 8:
if(hsize - ihsize - 14 > 0)
if (hsize - ihsize - 14 > 0)
avctx->pix_fmt = AV_PIX_FMT_PAL8;
else
avctx->pix_fmt = AV_PIX_FMT_GRAY8;
break;
case 1:
case 4:
if(hsize - ihsize - 14 > 0){
if (hsize - ihsize - 14 > 0) {
avctx->pix_fmt = AV_PIX_FMT_PAL8;
}else{
} else {
av_log(avctx, AV_LOG_ERROR, "Unknown palette for %d-colour BMP\n", 1<<depth);
return -1;
}
Expand All @@ -200,84 +203,85 @@ static int bmp_decode_frame(AVCodecContext *avctx,
return -1;
}

if(avctx->pix_fmt == AV_PIX_FMT_NONE){
if (avctx->pix_fmt == AV_PIX_FMT_NONE) {
av_log(avctx, AV_LOG_ERROR, "unsupported pixel format\n");
return -1;
}

if(p->data[0])
if (p->data[0])
avctx->release_buffer(avctx, p);

p->reference = 0;
if(ff_get_buffer(avctx, p) < 0){
if (ff_get_buffer(avctx, p) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
p->pict_type = AV_PICTURE_TYPE_I;
p->key_frame = 1;

buf = buf0 + hsize;
buf = buf0 + hsize;
dsize = buf_size - hsize;

/* Line size in file multiple of 4 */
n = ((avctx->width * depth + 31) / 8) & ~3;

if(n * avctx->height > dsize && comp != BMP_RLE4 && comp != BMP_RLE8){
if (n * avctx->height > dsize && comp != BMP_RLE4 && comp != BMP_RLE8) {
av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",
dsize, n * avctx->height);
return -1;
}

// RLE may skip decoding some picture areas, so blank picture before decoding
if(comp == BMP_RLE4 || comp == BMP_RLE8)
if (comp == BMP_RLE4 || comp == BMP_RLE8)
memset(p->data[0], 0, avctx->height * p->linesize[0]);

if(height > 0){
ptr = p->data[0] + (avctx->height - 1) * p->linesize[0];
if (height > 0) {
ptr = p->data[0] + (avctx->height - 1) * p->linesize[0];
linesize = -p->linesize[0];
} else {
ptr = p->data[0];
ptr = p->data[0];
linesize = p->linesize[0];
}

if(avctx->pix_fmt == AV_PIX_FMT_PAL8){
if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
int colors = 1 << depth;

memset(p->data[1], 0, 1024);

if(ihsize >= 36){
if (ihsize >= 36) {
int t;
buf = buf0 + 46;
t = bytestream_get_le32(&buf);
if(t < 0 || t > (1 << depth)){
t = bytestream_get_le32(&buf);
if (t < 0 || t > (1 << depth)) {
av_log(avctx, AV_LOG_ERROR, "Incorrect number of colors - %X for bitdepth %d\n", t, depth);
}else if(t){
} else if (t) {
colors = t;
}
}
buf = buf0 + 14 + ihsize; //palette location
if((hsize-ihsize-14) < (colors << 2)){ // OS/2 bitmap, 3 bytes per palette entry
for(i = 0; i < colors; i++)
// OS/2 bitmap, 3 bytes per palette entry
if ((hsize-ihsize-14) < (colors << 2)) {
for (i = 0; i < colors; i++)
((uint32_t*)p->data[1])[i] = (0xFFU<<24) | bytestream_get_le24(&buf);
}else{
for(i = 0; i < colors; i++)
} else {
for (i = 0; i < colors; i++)
((uint32_t*)p->data[1])[i] = 0xFFU << 24 | bytestream_get_le32(&buf);
}
buf = buf0 + hsize;
}
if(comp == BMP_RLE4 || comp == BMP_RLE8){
if(height < 0){
p->data[0] += p->linesize[0] * (avctx->height - 1);
if (comp == BMP_RLE4 || comp == BMP_RLE8) {
if (height < 0) {
p->data[0] += p->linesize[0] * (avctx->height - 1);
p->linesize[0] = -p->linesize[0];
}
bytestream2_init(&gb, buf, dsize);
ff_msrle_decode(avctx, (AVPicture*)p, depth, &gb);
if(height < 0){
p->data[0] += p->linesize[0] * (avctx->height - 1);
if (height < 0) {
p->data[0] += p->linesize[0] * (avctx->height - 1);
p->linesize[0] = -p->linesize[0];
}
}else{
switch(depth){
} else {
switch (depth) {
case 1:
for (i = 0; i < avctx->height; i++) {
int j;
Expand All @@ -298,16 +302,16 @@ static int bmp_decode_frame(AVCodecContext *avctx,
case 8:
case 24:
case 32:
for(i = 0; i < avctx->height; i++){
for (i = 0; i < avctx->height; i++) {
memcpy(ptr, buf, n);
buf += n;
ptr += linesize;
}
break;
case 4:
for(i = 0; i < avctx->height; i++){
for (i = 0; i < avctx->height; i++) {
int j;
for(j = 0; j < n; j++){
for (j = 0; j < n; j++) {
ptr[j*2+0] = (buf[j] >> 4) & 0xF;
ptr[j*2+1] = buf[j] & 0xF;
}
Expand All @@ -316,11 +320,11 @@ static int bmp_decode_frame(AVCodecContext *avctx,
}
break;
case 16:
for(i = 0; i < avctx->height; i++){
for (i = 0; i < avctx->height; i++) {
const uint16_t *src = (const uint16_t *) buf;
uint16_t *dst = (uint16_t *) ptr;
uint16_t *dst = (uint16_t *) ptr;

for(j = 0; j < avctx->width; j++)
for (j = 0; j < avctx->width; j++)
*dst++ = av_le2ne16(*src++);

buf += n;
Expand Down
1 change: 1 addition & 0 deletions libavcodec/c93.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
for (i = 0; i < 256; i++) {
palette[i] = 0xFFU << 24 | bytestream2_get_be24(&gb);
}
newpic->palette_has_changed = 1;
} else {
if (oldpic->data[1])
memcpy(newpic->data[1], oldpic->data[1], 256 * 4);
Expand Down
Loading

0 comments on commit 9dbedf3

Please sign in to comment.