OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2003-2004 the ffmpeg project | 2 * Copyright (C) 2003-2004 the ffmpeg project |
3 * | 3 * |
4 * This file is part of FFmpeg. | 4 * This file is part of FFmpeg. |
5 * | 5 * |
6 * FFmpeg is free software; you can redistribute it and/or | 6 * FFmpeg is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Lesser General Public | 7 * modify it under the terms of the GNU Lesser General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2.1 of the License, or (at your option) any later version. | 9 * version 2.1 of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 1613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1624 Vp3DecodeContext *s = avctx->priv_data; | 1624 Vp3DecodeContext *s = avctx->priv_data; |
1625 int y_fragment_count, c_fragment_count; | 1625 int y_fragment_count, c_fragment_count; |
1626 | 1626 |
1627 y_fragment_count = s->fragment_width[0] * s->fragment_height[0]; | 1627 y_fragment_count = s->fragment_width[0] * s->fragment_height[0]; |
1628 c_fragment_count = s->fragment_width[1] * s->fragment_height[1]; | 1628 c_fragment_count = s->fragment_width[1] * s->fragment_height[1]; |
1629 | 1629 |
1630 s->superblock_coding = av_malloc(s->superblock_count); | 1630 s->superblock_coding = av_malloc(s->superblock_count); |
1631 s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment)); | 1631 s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment)); |
1632 s->coded_fragment_list[0] = av_malloc(s->fragment_count * sizeof(int)); | 1632 s->coded_fragment_list[0] = av_malloc(s->fragment_count * sizeof(int)); |
1633 s->dct_tokens_base = av_malloc(64*s->fragment_count * sizeof(*s->dct_tokens_ base)); | 1633 s->dct_tokens_base = av_malloc(64*s->fragment_count * sizeof(*s->dct_tokens_ base)); |
1634 memset(s->dct_tokens_base, 0, 64*s->fragment_count * sizeof(*s->dct_tokens_b ase)); | |
rbultje1
2012/02/08 23:51:56
Use av_mallocz() instead of av_malloc() to zero it
DaleCurtis
2012/02/09 04:03:28
Done.
| |
1634 s->motion_val[0] = av_malloc(y_fragment_count * sizeof(*s->motion_val[0])); | 1635 s->motion_val[0] = av_malloc(y_fragment_count * sizeof(*s->motion_val[0])); |
1635 s->motion_val[1] = av_malloc(c_fragment_count * sizeof(*s->motion_val[1])); | 1636 s->motion_val[1] = av_malloc(c_fragment_count * sizeof(*s->motion_val[1])); |
1636 | 1637 |
1637 /* work out the block mapping tables */ | 1638 /* work out the block mapping tables */ |
1638 s->superblock_fragments = av_malloc(s->superblock_count * 16 * sizeof(int)); | 1639 s->superblock_fragments = av_malloc(s->superblock_count * 16 * sizeof(int)); |
1639 s->macroblock_coding = av_malloc(s->macroblock_count + 1); | 1640 s->macroblock_coding = av_malloc(s->macroblock_count + 1); |
1640 | 1641 |
1641 if (!s->superblock_coding || !s->all_fragments || !s->dct_tokens_base || | 1642 if (!s->superblock_coding || !s->all_fragments || !s->dct_tokens_base || |
1642 !s->coded_fragment_list[0] || !s->superblock_fragments || !s->macroblock _coding || | 1643 !s->coded_fragment_list[0] || !s->superblock_fragments || !s->macroblock _coding || |
1643 !s->motion_val[0] || !s->motion_val[1]) { | 1644 !s->motion_val[0] || !s->motion_val[1]) { |
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2391 .priv_data_size = sizeof(Vp3DecodeContext), | 2392 .priv_data_size = sizeof(Vp3DecodeContext), |
2392 .init = vp3_decode_init, | 2393 .init = vp3_decode_init, |
2393 .close = vp3_decode_end, | 2394 .close = vp3_decode_end, |
2394 .decode = vp3_decode_frame, | 2395 .decode = vp3_decode_frame, |
2395 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAM E_THREADS, | 2396 .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAM E_THREADS, |
2396 .flush = vp3_decode_flush, | 2397 .flush = vp3_decode_flush, |
2397 .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), | 2398 .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), |
2398 .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp3_init_thread_copy), | 2399 .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp3_init_thread_copy), |
2399 .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context) | 2400 .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context) |
2400 }; | 2401 }; |
OLD | NEW |