[FFmpeg-cvslog] hap: Move some per-stream setup into decoder init rather than per-frame
Tom Butterworth
git at videolan.org
Mon Jul 27 23:45:43 CEST 2015
ffmpeg | branch: master | Tom Butterworth <bangnoise at gmail.com> | Thu Jul 23 14:37:08 2015 -0400| [43dd004747fa697396b47d034a80e069facbea09] | committer: Vittorio Giovara
hap: Move some per-stream setup into decoder init rather than per-frame
This change will reject frames with a texture type which does not match
the stream description.
Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43dd004747fa697396b47d034a80e069facbea09
---
libavcodec/hapdec.c | 49 ++++++++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 21 deletions(-)
diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c
index 71f7db5..46dda04 100644
--- a/libavcodec/hapdec.c
+++ b/libavcodec/hapdec.c
@@ -74,29 +74,14 @@ static int setup_texture(AVCodecContext *avctx, size_t length)
HapContext *ctx = avctx->priv_data;
GetByteContext *gbc = &ctx->gbc;
int64_t snappy_size;
- const char *texture_name;
const char *compressorstr;
int ret;
- switch (ctx->section_type & 0x0F) {
- case HAP_FMT_RGBDXT1:
- ctx->tex_rat = 8;
- ctx->tex_fun = ctx->dxtc.dxt1_block;
- texture_name = "DXT1";
- break;
- case HAP_FMT_RGBADXT5:
- ctx->tex_rat = 16;
- ctx->tex_fun = ctx->dxtc.dxt5_block;
- texture_name = "DXT5";
- break;
- case HAP_FMT_YCOCGDXT5:
- ctx->tex_rat = 16;
- ctx->tex_fun = ctx->dxtc.dxt5ys_block;
- texture_name = "DXT5-YCoCg-scaled";
- break;
- default:
+ if ((avctx->codec_tag == MKTAG('H','a','p','1') && (ctx->section_type & 0x0F) != HAP_FMT_RGBDXT1) ||
+ (avctx->codec_tag == MKTAG('H','a','p','5') && (ctx->section_type & 0x0F) != HAP_FMT_RGBADXT5) ||
+ (avctx->codec_tag == MKTAG('H','a','p','Y') && (ctx->section_type & 0x0F) != HAP_FMT_YCOCGDXT5)) {
av_log(avctx, AV_LOG_ERROR,
- "Invalid format mode %02X.\n", ctx->section_type);
+ "Invalid texture format %#04x.\n", ctx->section_type & 0x0F);
return AVERROR_INVALIDDATA;
}
@@ -135,8 +120,7 @@ static int setup_texture(AVCodecContext *avctx, size_t length)
return AVERROR_INVALIDDATA;
}
- av_log(avctx, AV_LOG_DEBUG, "%s texture with %s compressor\n",
- texture_name, compressorstr);
+ av_log(avctx, AV_LOG_DEBUG, "%s compressor\n", compressorstr);
return 0;
}
@@ -220,6 +204,7 @@ static int hap_decode(AVCodecContext *avctx, void *data,
static av_cold int hap_init(AVCodecContext *avctx)
{
HapContext *ctx = avctx->priv_data;
+ const char *texture_name;
int ret = av_image_check_size(avctx->width, avctx->height, 0, avctx);
if (ret < 0) {
@@ -237,6 +222,28 @@ static av_cold int hap_init(AVCodecContext *avctx)
ff_texturedsp_init(&ctx->dxtc);
+ switch (avctx->codec_tag) {
+ case MKTAG('H','a','p','1'):
+ texture_name = "DXT1";
+ ctx->tex_rat = 8;
+ ctx->tex_fun = ctx->dxtc.dxt1_block;
+ break;
+ case MKTAG('H','a','p','5'):
+ texture_name = "DXT5";
+ ctx->tex_rat = 16;
+ ctx->tex_fun = ctx->dxtc.dxt5_block;
+ break;
+ case MKTAG('H','a','p','Y'):
+ texture_name = "DXT5-YCoCg-scaled";
+ ctx->tex_rat = 16;
+ ctx->tex_fun = ctx->dxtc.dxt5ys_block;
+ break;
+ default:
+ return AVERROR_DECODER_NOT_FOUND;
+ }
+
+ av_log(avctx, AV_LOG_DEBUG, "%s texture\n", texture_name);
+
ctx->slice_count = av_clip(avctx->thread_count, 1,
avctx->coded_height / TEXTURE_BLOCK_H);
More information about the ffmpeg-cvslog
mailing list