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

pixdesc: cosmetics

Browse Source
This commit is contained in:
Luca Barbato
2012-08-31 11:22:20 +02:00
parent cc86bd4ccc
commit a684267076
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavutil/pixdesc.c
View File

@@ -26,8 +26,10 @@
#include "intreadwrite.h" #include "intreadwrite.h"
void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4], void av_read_image_line(uint16_t *dst,
const AVPixFmtDescriptor *desc, int x, int y, int c, int w, const uint8_t *data[4], const int linesize[4],
const AVPixFmtDescriptor *desc,
int x, int y, int c, int w,
int read_pal_component) int read_pal_component)
{ {
AVComponentDescriptor comp = desc->comp[c]; AVComponentDescriptor comp = desc->comp[c];
@@ -53,7 +55,8 @@ void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesiz
*dst++ = val; *dst++ = val;
} }
} else { } else {
const uint8_t *p = data[plane] + y * linesize[plane] + x * step + comp.offset_plus1 - 1; const uint8_t *p = data[plane] + y * linesize[plane] +
x * step + comp.offset_plus1 - 1;
int is_8bit = shift + depth <= 8; int is_8bit = shift + depth <= 8;
if (is_8bit) if (is_8bit)
@@ -71,8 +74,10 @@ void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesiz
} }
} }
void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesize[4], void av_write_image_line(const uint16_t *src,
const AVPixFmtDescriptor *desc, int x, int y, int c, int w) uint8_t *data[4], const int linesize[4],
const AVPixFmtDescriptor *desc,
int x, int y, int c, int w)
{ {
AVComponentDescriptor comp = desc->comp[c]; AVComponentDescriptor comp = desc->comp[c];
int plane = comp.plane; int plane = comp.plane;
@@ -93,7 +98,8 @@ void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesi
} }
} else { } else {
int shift = comp.shift; int shift = comp.shift;
uint8_t *p = data[plane] + y * linesize[plane] + x * step + comp.offset_plus1 - 1; uint8_t *p = data[plane] + y * linesize[plane] +
x * step + comp.offset_plus1 - 1;
if (shift + depth <= 8) { if (shift + depth <= 8) {
p += !!(flags & PIX_FMT_BE); p += !!(flags & PIX_FMT_BE);