History

avcodec/huffyuv: Inline common alloc/free functions in their callers

Andreas Rheinhardt committed 2 years ago

Commit eef5d601 parent cebf1d54 files · +25 −37Browse files

Showing the changes to libavcodec (4 of 4 files). Show all

Unified · Split

4 files
  1. libavcodec/huffyuv.c +2 −26
  2. libavcodec/huffyuv.h +0 −2
  3. libavcodec/huffyuvdec.c +11 −3
  4. libavcodec/huffyuvenc.c +12 −6
libavcodec/huffyuv.c+2−26
@@ -28,12 +28,11 @@ · 27 unmodified lines
2828 * huffyuv codec for libavcodec.
2929 */
3030
31+#include <stddef.h>
3132 #include <stdint.h>
3233
33−#include "libavutil/attributes.h"
34−#include "libavutil/error.h"
3534 #include "libavutil/log.h"
36−#include "libavutil/mem.h"
35+#include "libavutil/macros.h"
3736
3837 #include "huffyuv.h"
3938
@@ -59,26 +58,3 @@ int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table, int · 19 unmodified lines
5958 }
6059 return 0;
6160 }
62−
63−av_cold int ff_huffyuv_alloc_temp(uint8_t *temp[3], uint16_t *temp16[3], int width)
64−{
65− int i;
66−
67− for (i=0; i<3; i++) {
68− temp[i] = av_malloc(4 * width + 16);
69− if (!temp[i])
70− return AVERROR(ENOMEM);
71− temp16[i] = (uint16_t*)temp[i];
72− }
73− return 0;
74−}
75−
76−av_cold void ff_huffyuv_common_end(uint8_t *temp[3], uint16_t *temp16[3])
77−{
78− int i;
79−
80− for(i = 0; i < 3; i++) {
81− av_freep(&temp[i]);
82− temp16[i] = NULL;
83− }
84−}
libavcodec/huffyuv.h+0−2
@@ -55,8 +55,6 @@ typedef enum Predictor { · 54 unmodified lines
5555 MEDIAN,
5656 } Predictor;
5757
58−void ff_huffyuv_common_end(uint8_t *temp[3], uint16_t *temp16[3]);
59−int ff_huffyuv_alloc_temp(uint8_t *temp[3], uint16_t *temp16[3], int width);
6058 int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table, int n);
6159
6260 #endif /* AVCODEC_HUFFYUV_H */
libavcodec/huffyuvdec.c+11−3
@@ -323,7 +323,11 @@ static av_cold int decode_end(AVCodecContext *avctx) · 322 unmodified lines
323323 HYuvDecContext *s = avctx->priv_data;
324324 int i;
325325
326− ff_huffyuv_common_end(s->temp, s->temp16);
326+ for (int i = 0; i < 3; i++) {
327+ av_freep(&s->temp[i]);
328+ s->temp16[i] = NULL;
329+ }
330+
327331 av_freep(&s->bitstream_buffer);
328332
329333 for (i = 0; i < 8; i++)
@@ -599,8 +603,12 @@ static av_cold int decode_init(AVCodecContext *avctx) · 269 unmodified lines
599603 return AVERROR_INVALIDDATA;
600604 }
601605
602− if ((ret = ff_huffyuv_alloc_temp(s->temp, s->temp16, avctx->width)) < 0)
603− return ret;
606+ for (int i = 0; i < 3; i++) {
607+ s->temp[i] = av_malloc(4 * avctx->width + 16);
608+ if (!s->temp[i])
609+ return AVERROR(ENOMEM);
610+ s->temp16[i] = (uint16_t*)s->temp[i];
611+ }
604612
605613 return 0;
606614 }
libavcodec/huffyuvenc.c+12−6
@@ -430,12 +430,15 @@ static av_cold int encode_init(AVCodecContext *avctx) · 429 unmodified lines
430430 s->stats[i][j]= 0;
431431 }
432432
433− ret = ff_huffyuv_alloc_temp(s->temp, s->temp16, avctx->width);
434− if (ret < 0)
435− return ret;
436−
437433 s->picture_number=0;
438434
435+ for (int i = 0; i < 3; i++) {
436+ s->temp[i] = av_malloc(4 * avctx->width + 16);
437+ if (!s->temp[i])
438+ return AVERROR(ENOMEM);
439+ s->temp16[i] = (uint16_t*)s->temp[i];
440+ }
441+
439442 return 0;
440443 }
441444 static int encode_422_bitstream(HYuvEncContext *s, int offset, int count)
@@ -1035,10 +1038,13 @@ static av_cold int encode_end(AVCodecContext *avctx) · 593 unmodified lines
10351038 {
10361039 HYuvEncContext *s = avctx->priv_data;
10371040
1038− ff_huffyuv_common_end(s->temp, s->temp16);
1039−
10401041 av_freep(&avctx->stats_out);
10411042
1043+ for (int i = 0; i < 3; i++) {
1044+ av_freep(&s->temp[i]);
1045+ s->temp16[i] = NULL;
1046+ }
1047+
10421048 return 0;
10431049 }
10441050

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t