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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/libdiracdec.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 libdirac library 2 * Dirac decoder support via libdirac library
3 * Copyright (c) 2005 BBC, Andrew Kennedy <dirac at rd dot bbc dot co dot uk> 3 * Copyright (c) 2005 BBC, Andrew Kennedy <dirac at rd dot bbc dot co dot uk>
4 * Copyright (c) 2006-2008 BBC, Anuradha Suraparaju <asuraparaju at gmail dot co m > 4 * Copyright (c) 2006-2008 BBC, Anuradha Suraparaju <asuraparaju at gmail dot co m >
5 * 5 *
6 * This file is part of FFmpeg. 6 * This file is part of FFmpeg.
7 * 7 *
8 * FFmpeg is free software; you can redistribute it and/or 8 * FFmpeg is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 DecoderState state = dirac_parse(p_dirac_params->p_decoder); 99 DecoderState state = dirac_parse(p_dirac_params->p_decoder);
100 switch (state) { 100 switch (state) {
101 case STATE_BUFFER: 101 case STATE_BUFFER:
102 return buf_size; 102 return buf_size;
103 103
104 case STATE_SEQUENCE: 104 case STATE_SEQUENCE:
105 { 105 {
106 /* tell FFmpeg about sequence details */ 106 /* tell FFmpeg about sequence details */
107 dirac_sourceparams_t *src_params = &p_dirac_params->p_decoder->src_p arams; 107 dirac_sourceparams_t *src_params = &p_dirac_params->p_decoder->src_p arams;
108 108
109 if (av_check_image_size(src_params->width, src_params->height, 109 if (av_image_check_size(src_params->width, src_params->height,
110 0, avccontext) < 0) { 110 0, avccontext) < 0) {
111 av_log(avccontext, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", 111 av_log(avccontext, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n",
112 src_params->width, src_params->height); 112 src_params->width, src_params->height);
113 avccontext->height = avccontext->width = 0; 113 avccontext->height = avccontext->width = 0;
114 return -1; 114 return -1;
115 } 115 }
116 116
117 avccontext->height = src_params->height; 117 avccontext->height = src_params->height;
118 avccontext->width = src_params->width; 118 avccontext->width = src_params->width;
119 119
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 CODEC_ID_DIRAC, 200 CODEC_ID_DIRAC,
201 sizeof(FfmpegDiracDecoderParams), 201 sizeof(FfmpegDiracDecoderParams),
202 libdirac_decode_init, 202 libdirac_decode_init,
203 NULL, 203 NULL,
204 libdirac_decode_close, 204 libdirac_decode_close,
205 libdirac_decode_frame, 205 libdirac_decode_frame,
206 CODEC_CAP_DELAY, 206 CODEC_CAP_DELAY,
207 .flush = libdirac_flush, 207 .flush = libdirac_flush,
208 .long_name = NULL_IF_CONFIG_SMALL("libdirac Dirac 2.2"), 208 .long_name = NULL_IF_CONFIG_SMALL("libdirac Dirac 2.2"),
209 }; 209 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/kgv1dec.c ('k') | source/patched-ffmpeg-mt/libavcodec/libopenjpeg.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698