Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Subsampling begone #160

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Subsampling begone #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62249ec
Move bitdepth from planes to image
kodawah Oct 25, 2015
f70fa75
Introduce pixel format values to remove subsampling from initialization
kodawah Oct 25, 2015
f246762
Store pixel format in images to remove per plane subsampling
kodawah Oct 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions examples/dump_video.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
#include "getopt.h"
#include "../src/logging.h"
#include "../include/daala/daaladec.h"
#include "../include/daala/codec.h"

const char *optstring = "o:r";
struct option options [] = {
Expand Down Expand Up @@ -123,10 +124,19 @@ static void video_write(void) {
for (pli = 0; pli < img.nplanes; pli++) {
int plane_width;
int plane_height;
int xdec;
int ydec;
xdec = img.planes[pli].xdec;
ydec = img.planes[pli].ydec;
int xdec = 0;
int ydec = 0;
if (pli && pli != 4)
if (img.pixel_format == OD_PIX_YUV422) {
xdec = 1;
} else if (img.pixel_format == OD_PIX_YUV411) {
xdec = 2;
} else if (img.pixel_format == OD_PIX_YUV420) {
xdec = 1;
ydec = 1;
}
}

plane_width = (img.width + (1 << xdec) - 1) >> xdec;
plane_height = (img.height + (1 << ydec) - 1) >> ydec;
for (i = 0; i < plane_height; i++) {
Expand Down Expand Up @@ -360,22 +370,16 @@ int main(int argc, char *argv[]) {
pic_height = di.pic_height;
fps_num = di.timebase_numerator;
fps_denom = di.timebase_denominator*di.frame_duration;
if (di.nplanes > 1) {
/*calculate pixel_fmt based on the xdec & ydec values from one of the
chroma planes.*/
if (di.plane_info[1].xdec == 1 && di.plane_info[1].ydec == 1) {
pix_fmt = 0;
}
else if (di.plane_info[1].xdec == 1 && di.plane_info[1].ydec == 0) {
pix_fmt = 2;
}
else if (di.plane_info[1].xdec == 0 && di.plane_info[1].ydec == 0) {
pix_fmt = 3;
}
}
else {

if (di.pixel_format == OD_PIX_YUV420)
pix_fmt = 0;
else if (di.pixel_format == OD_PIX_YUV422)
pix_fmt = 2;
else if (di.pixel_format == OD_PIX_YUV444)
pix_fmt = 3;
else if (di.pixel_format == OD_PIX_YUV400)
pix_fmt = 4;
}

if (pix_fmt >= 5 || pix_fmt == 1) {
fprintf(stderr, "Unknown pixel format: %i\n", pix_fmt);
exit(1);
Expand Down
190 changes: 78 additions & 112 deletions examples/encoder_example.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct av_input{
int video_interlacing;
char video_chroma_type[16];
int video_nplanes;
daala_plane_info video_plane_info[OD_NPLANES_MAX];
int video_format;
od_img video_img;
int video_cur_img;
int video_depth;
Expand Down Expand Up @@ -176,6 +176,8 @@ static void id_y4m_file(av_input *avin, const char *file, FILE *test) {
int ret;
int pli;
int bi;
int xdec[OD_NPLANES_MAX] = { 0 };
int ydec[OD_NPLANES_MAX] = { 0 };
for (bi = 0; bi < 127; bi++) {
ret = fread(buf + bi, 1, 1, test);
if (ret < 1) return;
Expand Down Expand Up @@ -209,160 +211,112 @@ static void id_y4m_file(av_input *avin, const char *file, FILE *test) {
(double)avin->video_fps_n/avin->video_fps_d, avin->video_chroma_type);
/*Allocate buffers for the image data.*/
/*TODO: Specify chroma offsets.*/
avin->video_plane_info[0].xdec = 0;
avin->video_plane_info[0].ydec = 0;
avin->video_depth = 8;
avin->video_swapendian = 0;
avin->video_nplanes = 3;
avin->video_swapendian = host_is_big_endian();
if (strcmp(avin->video_chroma_type, "444") == 0) {
avin->video_nplanes = 3;
avin->video_plane_info[1].xdec = 0;
avin->video_plane_info[1].ydec = 0;
avin->video_plane_info[2].xdec = 0;
avin->video_plane_info[2].ydec = 0;
avin->video_format = OD_PIX_YUV444;
}
else if (strcmp(avin->video_chroma_type, "444p10") == 0) {
avin->video_nplanes = 3;
avin->video_format = OD_PIX_YUV444;
avin->video_depth = 10;
avin->video_swapendian = host_is_big_endian();
avin->video_plane_info[1].xdec = 0;
avin->video_plane_info[1].ydec = 0;
avin->video_plane_info[2].xdec = 0;
avin->video_plane_info[2].ydec = 0;
}
else if (strcmp(avin->video_chroma_type, "444p12") == 0) {
avin->video_nplanes = 3;
avin->video_format = OD_PIX_YUV444;
avin->video_depth = 12;
avin->video_swapendian = host_is_big_endian();
avin->video_plane_info[1].xdec = 0;
avin->video_plane_info[1].ydec = 0;
avin->video_plane_info[2].xdec = 0;
avin->video_plane_info[2].ydec = 0;
}
else if (strcmp(avin->video_chroma_type, "444p14") == 0) {
avin->video_nplanes = 3;
avin->video_format = OD_PIX_YUV444;
avin->video_depth = 14;
avin->video_swapendian = host_is_big_endian();
avin->video_plane_info[1].xdec = 0;
avin->video_plane_info[1].ydec = 0;
avin->video_plane_info[2].xdec = 0;
avin->video_plane_info[2].ydec = 0;
}
else if (strcmp(avin->video_chroma_type, "444p16") == 0) {
avin->video_nplanes = 3;
avin->video_format = OD_PIX_YUV444;
avin->video_depth = 16;
avin->video_swapendian = host_is_big_endian();
avin->video_plane_info[1].xdec = 0;
avin->video_plane_info[1].ydec = 0;
avin->video_plane_info[2].xdec = 0;
avin->video_plane_info[2].ydec = 0;
}
else if (strcmp(avin->video_chroma_type, "444alpha") == 0) {
avin->video_nplanes = 4;
avin->video_plane_info[1].xdec = 0;
avin->video_plane_info[1].ydec = 0;
avin->video_plane_info[2].xdec = 0;
avin->video_plane_info[2].ydec = 0;
avin->video_plane_info[3].xdec = 0;
avin->video_plane_info[3].ydec = 0;
avin->video_format = OD_PIX_YUV444;
}
else if (strcmp(avin->video_chroma_type, "422") == 0) {
avin->video_nplanes = 3;
avin->video_plane_info[1].xdec = 1;
avin->video_plane_info[1].ydec = 0;
avin->video_plane_info[2].xdec = 1;
avin->video_plane_info[2].ydec = 0;
avin->video_format = OD_PIX_YUV422;
xdec[1] = 1;
xdec[2] = 1;
}
else if (strcmp(avin->video_chroma_type, "422p10") == 0) {
avin->video_nplanes = 3;
avin->video_format = OD_PIX_YUV422;
avin->video_depth = 10;
avin->video_swapendian = host_is_big_endian();
avin->video_plane_info[1].xdec = 1;
avin->video_plane_info[1].ydec = 0;
avin->video_plane_info[2].xdec = 1;
avin->video_plane_info[2].ydec = 0;
xdec[1] = 1;
xdec[2] = 1;
}
else if (strcmp(avin->video_chroma_type, "422p12") == 0) {
avin->video_nplanes = 3;
avin->video_format = OD_PIX_YUV422;
avin->video_depth = 12;
avin->video_swapendian = host_is_big_endian();
avin->video_plane_info[1].xdec = 1;
avin->video_plane_info[1].ydec = 0;
avin->video_plane_info[2].xdec = 1;
avin->video_plane_info[2].ydec = 0;
xdec[1] = 1;
xdec[2] = 1;
}
else if (strcmp(avin->video_chroma_type, "422p14") == 0) {
avin->video_nplanes = 3;
avin->video_format = OD_PIX_YUV422;
avin->video_depth = 14;
avin->video_swapendian = host_is_big_endian();
avin->video_plane_info[1].xdec = 1;
avin->video_plane_info[1].ydec = 0;
avin->video_plane_info[2].xdec = 1;
avin->video_plane_info[2].ydec = 0;
xdec[1] = 1;
xdec[2] = 1;
}
else if (strcmp(avin->video_chroma_type, "422p16") == 0) {
avin->video_nplanes = 3;
avin->video_format = OD_PIX_YUV422;
avin->video_depth = 16;
avin->video_swapendian = host_is_big_endian();
avin->video_plane_info[1].xdec = 1;
avin->video_plane_info[1].ydec = 0;
avin->video_plane_info[2].xdec = 1;
avin->video_plane_info[2].ydec = 0;
xdec[1] = 1;
xdec[2] = 1;
}
else if (strcmp(avin->video_chroma_type, "411") == 0) {
avin->video_nplanes = 3;
avin->video_plane_info[1].xdec = 2;
avin->video_plane_info[1].ydec = 0;
avin->video_plane_info[2].xdec = 2;
avin->video_plane_info[2].ydec = 0;
avin->video_format = OD_PIX_YUV411;
xdec[1] = 2;
xdec[2] = 2;
}
else if (strcmp(avin->video_chroma_type, "420") == 0 ||
strcmp(avin->video_chroma_type, "420jpeg") == 0 ||
strcmp(avin->video_chroma_type, "420mpeg2") == 0 ||
strcmp(avin->video_chroma_type, "420paldv") == 0) {
avin->video_nplanes = 3;
avin->video_plane_info[1].xdec = 1;
avin->video_plane_info[1].ydec = 1;
avin->video_plane_info[2].xdec = 1;
avin->video_plane_info[2].ydec = 1;
avin->video_format = OD_PIX_YUV420;
xdec[1] = 1;
ydec[1] = 1;
xdec[2] = 1;
ydec[2] = 1;
}
else if (strcmp(avin->video_chroma_type, "420p10") == 0){
avin->video_nplanes = 3;
avin->video_format = OD_PIX_YUV420;
avin->video_depth = 10;
avin->video_swapendian = host_is_big_endian();
avin->video_plane_info[1].xdec = 1;
avin->video_plane_info[1].ydec = 1;
avin->video_plane_info[2].xdec = 1;
avin->video_plane_info[2].ydec = 1;
xdec[1] = 1;
ydec[1] = 1;
xdec[2] = 1;
ydec[2] = 1;
}
else if (strcmp(avin->video_chroma_type, "420p12") == 0) {
avin->video_nplanes = 3;
avin->video_format = OD_PIX_YUV420;
avin->video_depth = 12;
avin->video_swapendian = host_is_big_endian();
avin->video_plane_info[1].xdec = 1;
avin->video_plane_info[1].ydec = 1;
avin->video_plane_info[2].xdec = 1;
avin->video_plane_info[2].ydec = 1;
xdec[1] = 1;
ydec[1] = 1;
xdec[2] = 1;
ydec[2] = 1;
}
else if (strcmp(avin->video_chroma_type, "420p14") == 0) {
avin->video_nplanes = 3;
avin->video_format = OD_PIX_YUV420;
avin->video_depth = 14;
avin->video_swapendian = host_is_big_endian();
avin->video_plane_info[1].xdec = 1;
avin->video_plane_info[1].ydec = 1;
avin->video_plane_info[2].xdec = 1;
avin->video_plane_info[2].ydec = 1;
xdec[1] = 1;
ydec[1] = 1;
xdec[2] = 1;
ydec[2] = 1;
}
else if (strcmp(avin->video_chroma_type, "420p16") == 0) {
avin->video_nplanes = 3;
avin->video_format = OD_PIX_YUV420;
avin->video_depth = 16;
avin->video_swapendian = host_is_big_endian();
avin->video_plane_info[1].xdec = 1;
avin->video_plane_info[1].ydec = 1;
avin->video_plane_info[2].xdec = 1;
avin->video_plane_info[2].ydec = 1;
xdec[1] = 1;
ydec[1] = 1;
xdec[2] = 1;
ydec[2] = 1;
}
else if (strcmp(avin->video_chroma_type, "mono") == 0) {
avin->video_nplanes = 1;
avin->video_format = OD_PIX_YUV400;
}
else {
fprintf(stderr, "Unknown chroma sampling type: '%s'.\n",
Expand All @@ -373,21 +327,20 @@ static void id_y4m_file(av_input *avin, const char *file, FILE *test) {
img->nplanes = avin->video_nplanes;
img->width = avin->video_pic_w;
img->height = avin->video_pic_h;
img->bitdepth = avin->video_depth;
img->pixel_format = avin->video_format;
for (pli = 0; pli < img->nplanes; pli++) {
od_img_plane *iplane;
iplane = img->planes + pli;
iplane->xdec = avin->video_plane_info[pli].xdec;
iplane->ydec = avin->video_plane_info[pli].ydec;
/*At this moment, Y4M input is always planar.*/
/*The input depth need not match the encoded depth.
The input copy will convert to whatever was set for
di.bitdepth_mode.*/
iplane->xstride = avin->video_depth > 8 ? 2 : 1;
iplane->ystride = ((avin->video_pic_w
+ (1<<iplane->xdec)-1)>>iplane->xdec)*iplane->xstride;
iplane->bitdepth = avin->video_depth;
+ (1 << xdec[pli]) - 1) >> xdec[pli]) * iplane->xstride;
iplane->data = _ogg_malloc(iplane->ystride*
((avin->video_pic_h + (1<<iplane->ydec) - 1)>>iplane->ydec));
((avin->video_pic_h + (1 << ydec[pli]) - 1) >> ydec[pli]));
}
}

Expand Down Expand Up @@ -461,11 +414,25 @@ int fetch_and_process_video(av_input *avin, ogg_page *page,
od_img_plane *iplane;
int bytes;
size_t plane_sz;
int xdec = 0;
int ydec = 0;
iplane = img->planes + pli;
bytes = iplane->bitdepth > 8 ? 2 : 1;
plane_sz = ((avin->video_pic_w + (1 << iplane->xdec) - 1)
>> iplane->xdec)*((avin->video_pic_h + (1 << iplane->ydec)
- 1) >> iplane->ydec)*bytes;
bytes = img->bitdepth > 8 ? 2 : 1;

if (pli && pli != 4) {
if (img->pixel_format == OD_PIX_YUV422) {
xdec = 1;
} else if (img->pixel_format == OD_PIX_YUV411) {
xdec = 2;
} else if (img->pixel_format == OD_PIX_YUV420) {
xdec = 1;
ydec = 1;
}
}

plane_sz = ((avin->video_pic_w + (1 << xdec) - 1)
>> xdec)*((avin->video_pic_h + (1 << ydec)
- 1) >> ydec)*bytes;
ret = fread(iplane->data, 1, plane_sz, avin->video_infile);
if (ret != plane_sz) {
fprintf(stderr, "Error reading YUV frame data.\n");
Expand Down Expand Up @@ -853,8 +820,7 @@ int main(int argc, char **argv) {
di.pixel_aspect_numerator = avin.video_par_n;
di.pixel_aspect_denominator = avin.video_par_d;
di.nplanes = avin.video_nplanes;
memcpy(di.plane_info, avin.video_plane_info,
di.nplanes*sizeof(*di.plane_info));
di.pixel_format = avin.video_format;
di.keyframe_rate = video_keyframe_rate;
/*TODO: Other crap.*/
dd = daala_encode_create(&di);
Expand Down
13 changes: 9 additions & 4 deletions examples/player_example.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,15 +595,20 @@ void img_to_rgb(player_example *player, SDL_Texture *texture,
int cr_stride;
int width;
int height;
int xdec;
int ydec;
int xdec = 0;
int ydec = 0;
int i;
int j;
unsigned char *pixels;
int pitch;
/*Assume both C planes are decimated.*/
xdec = img->planes[1].xdec;
ydec = img->planes[1].ydec;
if (img->pixel_format == OD_PIX_YUV422) {
xdec = 1;
} else if (img->pixel_format == OD_PIX_YUV420) {
xdec = 1;
ydec = 1;
}

y_stride = img->planes[0].ystride;
cb_stride = img->planes[1].ystride;
cr_stride = img->planes[2].ystride;
Expand Down
Loading