Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/libschroedingerdec.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Dirac decoder support via Schroedinger libraries 2 * Dirac decoder support via Schroedinger libraries
3 * Copyright (c) 2008 BBC, Anuradha Suraparaju <asuraparaju at gmail dot com > 3 * Copyright (c) 2008 BBC, Anuradha Suraparaju <asuraparaju at gmail dot com >
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 } 163 }
164 164
165 static void libschroedinger_handle_first_access_unit(AVCodecContext *avccontext) 165 static void libschroedinger_handle_first_access_unit(AVCodecContext *avccontext)
166 { 166 {
167 FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data; 167 FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data;
168 SchroDecoder *decoder = p_schro_params->decoder; 168 SchroDecoder *decoder = p_schro_params->decoder;
169 169
170 p_schro_params->format = schro_decoder_get_video_format(decoder); 170 p_schro_params->format = schro_decoder_get_video_format(decoder);
171 171
172 /* Tell FFmpeg about sequence details. */ 172 /* Tell FFmpeg about sequence details. */
173 if (av_check_image_size(p_schro_params->format->width, p_schro_params->forma t->height, 173 if (av_image_check_size(p_schro_params->format->width, p_schro_params->forma t->height,
174 0, avccontext) < 0) { 174 0, avccontext) < 0) {
175 av_log(avccontext, AV_LOG_ERROR, "invalid dimensions (%dx%d)\n", 175 av_log(avccontext, AV_LOG_ERROR, "invalid dimensions (%dx%d)\n",
176 p_schro_params->format->width, p_schro_params->format->height); 176 p_schro_params->format->width, p_schro_params->format->height);
177 avccontext->height = avccontext->width = 0; 177 avccontext->height = avccontext->width = 0;
178 return; 178 return;
179 } 179 }
180 avccontext->height = p_schro_params->format->height; 180 avccontext->height = p_schro_params->format->height;
181 avccontext->width = p_schro_params->format->width; 181 avccontext->width = p_schro_params->format->width;
182 avccontext->pix_fmt = GetFfmpegChromaFormat(p_schro_params->format->chroma_f ormat); 182 avccontext->pix_fmt = GetFfmpegChromaFormat(p_schro_params->format->chroma_f ormat);
183 183
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 CODEC_ID_DIRAC, 352 CODEC_ID_DIRAC,
353 sizeof(FfmpegSchroDecoderParams), 353 sizeof(FfmpegSchroDecoderParams),
354 libschroedinger_decode_init, 354 libschroedinger_decode_init,
355 NULL, 355 NULL,
356 libschroedinger_decode_close, 356 libschroedinger_decode_close,
357 libschroedinger_decode_frame, 357 libschroedinger_decode_frame,
358 CODEC_CAP_DELAY, 358 CODEC_CAP_DELAY,
359 .flush = libschroedinger_flush, 359 .flush = libschroedinger_flush,
360 .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"), 360 .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
361 }; 361 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/libopenjpeg.c ('k') | source/patched-ffmpeg-mt/libavcodec/libvpxdec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698