RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-17 21:14:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '95db8c757cb003a71b040b567f38be74151deb5c'

Browse Source 
* commit '95db8c757cb003a71b040b567f38be74151deb5c':
  screenpresso: Add extended pixel format support

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-05-08 23:43:26 +01:00
commit 5d31074daf
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libavcodec/screenpresso.c
View File

@ -30,7 +30,7 @@
* rebuilt frame (not the reference), and since there is no coordinate system
* they contain exactly as many pixel as the keyframe.
*
* Supports: BGR24
* Supports: BGRA, BGR24, RGB555
*/
#include <stdint.h>
@ -79,10 +79,8 @@ static av_cold int screenpresso_init(AVCodecContext *avctx)
if (!ctx->current)
return AVERROR(ENOMEM);
avctx->pix_fmt = AV_PIX_FMT_BGR24;
/* Allocate maximum size possible, a full frame */
ctx->inflated_size = avctx->width * avctx->height * 3;
/* Allocate maximum size possible, a full RGBA frame */
ctx->inflated_size = avctx->width * avctx->height * 4;
ctx->inflated_buf = av_malloc(ctx->inflated_size);
if (!ctx->inflated_buf)
return AVERROR(ENOMEM);
@ -108,7 +106,7 @@ static int screenpresso_decode_frame(AVCodecContext *avctx, void *data,
ScreenpressoContext *ctx = avctx->priv_data;
AVFrame *frame = data;
uLongf length = ctx->inflated_size;
int keyframe;
int keyframe, component_size, src_linesize;
int ret;
/* Size check */
@ -118,13 +116,28 @@ static int screenpresso_decode_frame(AVCodecContext *avctx, void *data,
}
/* Basic sanity check, but not really harmful */
if ((avpkt->data[0] != 0x73 && avpkt->data[0] != 0x72) ||
avpkt->data[1] != 8) { // bpp probably
av_log(avctx, AV_LOG_WARNING, "Unknown header 0x%02X%02X\n",
avpkt->data[0], avpkt->data[1]);
}
if (avpkt->data[0] != 0x73 && avpkt->data[0] != 0x72)
av_log(avctx, AV_LOG_WARNING, "Unknown header 0x%02X\n", avpkt->data[0]);
keyframe = (avpkt->data[0] == 0x73);
/* Pixel size */
component_size = ((avpkt->data[1] >> 2) & 0x03) + 1;
switch (component_size) {
case 2:
avctx->pix_fmt = AV_PIX_FMT_RGB555LE;
break;
case 3:
avctx->pix_fmt = AV_PIX_FMT_BGR24;
break;
case 4:
avctx->pix_fmt = AV_PIX_FMT_BGRA;
break;
default:
av_log(avctx, AV_LOG_ERROR, "Invalid bits per pixel value (%d)\n",
component_size);
return AVERROR_INVALIDDATA;
}
/* Inflate the frame after the 2 byte header */
ret = uncompress(ctx->inflated_buf, &length,
avpkt->data + 2, avpkt->size - 2);
@ -137,18 +150,21 @@ static int screenpresso_decode_frame(AVCodecContext *avctx, void *data,
if (ret < 0)
return ret;
/* Codec has aligned strides */
src_linesize = FFALIGN(avctx->width * component_size, 4);
/* When a keyframe is found, copy it (flipped) */
if (keyframe)
av_image_copy_plane(ctx->current->data[0] +
ctx->current->linesize[0] * (avctx->height - 1),
-1 * ctx->current->linesize[0],
ctx->inflated_buf, avctx->width * 3,
avctx->width * 3, avctx->height);
ctx->inflated_buf, src_linesize,
avctx->width * component_size, avctx->height);
/* Otherwise sum the delta on top of the current frame */
else
sum_delta_flipped(ctx->current->data[0], ctx->current->linesize[0],
ctx->inflated_buf, avctx->width * 3,
avctx->width * 3, avctx->height);
ctx->inflated_buf, src_linesize,
avctx->width * component_size, avctx->height);
/* Frame is ready to be output */
ret = av_frame_ref(frame, ctx->current);