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

Side by Side Diff: libvpx/source/libvpx/vpx/src/vpx_decoder.c

Issue 7624054: Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)." (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party
Patch Set: Created 9 years, 4 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
« no previous file with comments | « libvpx/source/libvpx/vp8/vp8dx_arm.mk ('k') | libvpx/source/libvpx/vpx/src/vpx_encoder.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 18 matching lines...) Expand all
29 if (ver != VPX_DECODER_ABI_VERSION) 29 if (ver != VPX_DECODER_ABI_VERSION)
30 res = VPX_CODEC_ABI_MISMATCH; 30 res = VPX_CODEC_ABI_MISMATCH;
31 else if (!ctx || !iface) 31 else if (!ctx || !iface)
32 res = VPX_CODEC_INVALID_PARAM; 32 res = VPX_CODEC_INVALID_PARAM;
33 else if (iface->abi_version != VPX_CODEC_INTERNAL_ABI_VERSION) 33 else if (iface->abi_version != VPX_CODEC_INTERNAL_ABI_VERSION)
34 res = VPX_CODEC_ABI_MISMATCH; 34 res = VPX_CODEC_ABI_MISMATCH;
35 else if ((flags & VPX_CODEC_USE_XMA) && !(iface->caps & VPX_CODEC_CAP_XMA)) 35 else if ((flags & VPX_CODEC_USE_XMA) && !(iface->caps & VPX_CODEC_CAP_XMA))
36 res = VPX_CODEC_INCAPABLE; 36 res = VPX_CODEC_INCAPABLE;
37 else if ((flags & VPX_CODEC_USE_POSTPROC) && !(iface->caps & VPX_CODEC_CAP_P OSTPROC)) 37 else if ((flags & VPX_CODEC_USE_POSTPROC) && !(iface->caps & VPX_CODEC_CAP_P OSTPROC))
38 res = VPX_CODEC_INCAPABLE; 38 res = VPX_CODEC_INCAPABLE;
39 else if ((flags & VPX_CODEC_USE_ERROR_CONCEALMENT) &&
40 !(iface->caps & VPX_CODEC_CAP_ERROR_CONCEALMENT))
41 res = VPX_CODEC_INCAPABLE;
42 else if ((flags & VPX_CODEC_USE_INPUT_PARTITION) &&
43 !(iface->caps & VPX_CODEC_CAP_INPUT_PARTITION))
44 res = VPX_CODEC_INCAPABLE;
45 else if (!(iface->caps & VPX_CODEC_CAP_DECODER)) 39 else if (!(iface->caps & VPX_CODEC_CAP_DECODER))
46 res = VPX_CODEC_INCAPABLE; 40 res = VPX_CODEC_INCAPABLE;
47 else 41 else
48 { 42 {
49 memset(ctx, 0, sizeof(*ctx)); 43 memset(ctx, 0, sizeof(*ctx));
50 ctx->iface = iface; 44 ctx->iface = iface;
51 ctx->name = iface->name; 45 ctx->name = iface->name;
52 ctx->priv = NULL; 46 ctx->priv = NULL;
53 ctx->init_flags = flags; 47 ctx->init_flags = flags;
54 ctx->config.dec = cfg; 48 ctx->config.dec = cfg;
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 /* Everything look ok, set the mmap in the decoder */ 232 /* Everything look ok, set the mmap in the decoder */
239 res = ctx->iface->set_mmap(ctx, mmap); 233 res = ctx->iface->set_mmap(ctx, mmap);
240 234
241 if (res) 235 if (res)
242 break; 236 break;
243 } 237 }
244 } 238 }
245 239
246 return SAVE_STATUS(ctx, res); 240 return SAVE_STATUS(ctx, res);
247 } 241 }
OLDNEW
« no previous file with comments | « libvpx/source/libvpx/vp8/vp8dx_arm.mk ('k') | libvpx/source/libvpx/vpx/src/vpx_encoder.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698