virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d'

Browse Source 
* commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d':
  exr: Add a gamma flag to exr loader to avoid banding

Conflicts:
	libavcodec/exr.c

See: cd3daad77e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-05 21:55:44 +01:00
commit 81f116d31c
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libavcodec/exr.c
View File

@ -27,17 +27,16 @@
* For more information on the OpenEXR format, visit:
* http://openexr.com/
*
* exr_flt2uint() and exr_halflt2uint() is credited to Reimar Döffinger.
* exr_half2float() is credited to Aaftab Munshi; Dan Ginsburg, Dave Shreiner.
*
* exr_flt2uint() and exr_halflt2uint() is credited to Reimar Döffinger.
* exr_half2float() is credited to Aaftab Munshi, Dan Ginsburg, Dave Shreiner.
*/
#include <zlib.h>
#include <float.h>
#include <zlib.h>
#include "libavutil/imgutils.h"
#include "libavutil/opt.h"
#include "libavutil/intfloat.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "bytestream.h"
@ -112,13 +111,12 @@ typedef struct EXRContext {
const char *layer;
float gamma;
uint16_t gamma_table[65536];
} EXRContext;
/* -15 stored using a single precision bias of 127 */
#define HALF_FLOAT_MIN_BIASED_EXP_AS_SINGLE_FP_EXP 0x38000000
/* max exponent value in single precision that will be converted
* to Inf or Nan when stored as a half-float */
#define HALF_FLOAT_MAX_BIASED_EXP_AS_SINGLE_FP_EXP 0x47800000
@ -128,7 +126,7 @@ typedef struct EXRContext {
#define HALF_FLOAT_MAX_BIASED_EXP (0x1F << 10)
/*
/**
* Convert a half float as a uint16_t into a full float.
*
* @param hf half float as uint16_t
@ -137,10 +135,10 @@ typedef struct EXRContext {
*/
static union av_intfloat32 exr_half2float(uint16_t hf)
{
unsigned int sign = (unsigned int)(hf >> 15);
unsigned int mantissa = (unsigned int)(hf & ((1 << 10) - 1));
unsigned int exp = (unsigned int)(hf & HALF_FLOAT_MAX_BIASED_EXP);
union av_intfloat32 f;
unsigned int sign = (unsigned int) (hf >> 15);
unsigned int mantissa = (unsigned int) (hf & ((1 << 10) - 1));
unsigned int exp = (unsigned int) (hf & HALF_FLOAT_MAX_BIASED_EXP);
union av_intfloat32 f;
if (exp == HALF_FLOAT_MAX_BIASED_EXP) {
// we have a half-float NaN or Inf
@ -843,8 +841,8 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
int axmax = (avctx->width - (s->xmax + 1)) * 2 * s->desc->nb_components;
int bxmin = s->xmin * 2 * s->desc->nb_components;
int i, x, buf_size = s->buf_size;
int ret;
float one_gamma = 1.0f / s->gamma;
int ret;
line_offset = AV_RL64(s->gb.buffer + jobnr * 8);
// Check if the buffer has the required bytes needed from the offset
@ -926,17 +924,17 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
for (x = 0; x < xdelta; x++) {
union av_intfloat32 t;
t.i = bytestream_get_le32(&r);
if ( t.f > 0.0f ) /* avoid negative values */
if (t.f > 0.0f) /* avoid negative values */
t.f = powf(t.f, one_gamma);
*ptr_x++ = exr_flt2uint(t.i);
t.i = bytestream_get_le32(&g);
if ( t.f > 0.0f )
if (t.f > 0.0f)
t.f = powf(t.f, one_gamma);
*ptr_x++ = exr_flt2uint(t.i);
t.i = bytestream_get_le32(&b);
if ( t.f > 0.0f )
if (t.f > 0.0f)
t.f = powf(t.f, one_gamma);
*ptr_x++ = exr_flt2uint(t.i);
if (channel_buffer[3])
@ -1346,9 +1344,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
static av_cold int decode_init(AVCodecContext *avctx)
{
EXRContext *s = avctx->priv_data;
uint32_t i;
union av_intfloat32 t;
EXRContext *s = avctx->priv_data;
float one_gamma = 1.0f / s->gamma;
s->avctx = avctx;
@ -1368,15 +1366,14 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->w = 0;
s->h = 0;
if ( one_gamma > 0.9999f && one_gamma < 1.0001f ) {
for ( i = 0; i < 65536; ++i ) {
if (one_gamma > 0.9999f && one_gamma < 1.0001f) {
for (i = 0; i < 65536; ++i)
s->gamma_table[i] = exr_halflt2uint(i);
}
} else {
for ( i = 0; i < 65536; ++i ) {
for (i = 0; i < 65536; ++i) {
t = exr_half2float(i);
/* If negative value we reuse half value */
if ( t.f <= 0.0f ) {
if (t.f <= 0.0f) {
s->gamma_table[i] = exr_halflt2uint(i);
} else {
t.f = powf(t.f, one_gamma);
@ -1427,7 +1424,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
static const AVOption options[] = {
{ "layer", "Set the decoding layer", OFFSET(layer),
AV_OPT_TYPE_STRING, { .str = "" }, 0, 0, VD },
{ "gamma", "Set the float gamma value when decoding (experimental/unsupported)", OFFSET(gamma),
{ "gamma", "Set the float gamma value when decoding", OFFSET(gamma),
AV_OPT_TYPE_FLOAT, { .dbl = 1.0f }, 0.001, FLT_MAX, VD },
{ NULL },
};