-
Notifications
You must be signed in to change notification settings - Fork 2
/
ffmpeg_cavs_dra-4.4.patch
1144 lines (1134 loc) · 38 KB
/
ffmpeg_cavs_dra-4.4.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -ruN ffmpeg-4.4/configure ffmpeg_cavs_dra-4.4/configure
--- ffmpeg-4.4/configure 2021-04-09 05:28:39.000000000 +0800
+++ ffmpeg_cavs_dra-4.4/configure 2021-05-27 14:32:27.597132000 +0800
@@ -349,7 +349,9 @@
--disable-vaapi disable Video Acceleration API (mainly Unix/Intel) code [autodetect]
--disable-vdpau disable Nvidia Video Decode and Presentation API for Unix code [autodetect]
--disable-videotoolbox disable VideoToolbox code [autodetect]
-
+ --enable-libcavs enable AVS+ decoding via libcavs [autodetect]
+ --enable-libdraplus enable DRA1 decoding via libdraplus [autodetect]
+
Toolchain options:
--arch=ARCH select architecture [$arch]
--cpu=CPU select the minimum required CPU (affects
@@ -1737,6 +1739,8 @@
libfdk_aac
openssl
libtls
+ libcavs
+ libdraplus
"
EXTERNAL_LIBRARY_VERSION3_LIST="
@@ -3299,6 +3303,8 @@
videotoolbox_suggest="coreservices"
videotoolbox_deps="corefoundation coremedia corevideo"
videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames"
+libcavs_decoder_deps="libcavs"
+libdraplus_decoder_deps="libdraplus"
# demuxers / muxers
ac3_demuxer_select="ac3_parser"
@@ -6538,6 +6544,8 @@
}
enabled vapoursynth && require_pkg_config vapoursynth "vapoursynth-script >= 42" VSScript.h vsscript_init
+enabled libcavs && require_pkg_config libcavs "libcavs >= 1.0.0" libcavs.h cavs_decoder_create
+enabled libdraplus && require_pkg_config libdraplus "libdraplus >= 1.0.0" DRAPlusDec.h DRAPlusDecCreate
if enabled gcrypt; then
GCRYPT_CONFIG="${cross_prefix}libgcrypt-config"
diff -ruN ffmpeg-4.4/libavcodec/allcodecs.c ffmpeg_cavs_dra-4.4/libavcodec/allcodecs.c
--- ffmpeg-4.4/libavcodec/allcodecs.c 2021-04-09 05:28:39.000000000 +0800
+++ ffmpeg_cavs_dra-4.4/libavcodec/allcodecs.c 2021-05-27 15:36:20.198209000 +0800
@@ -67,6 +67,7 @@
extern AVCodec ff_bmv_video_decoder;
extern AVCodec ff_brender_pix_decoder;
extern AVCodec ff_c93_decoder;
+extern AVCodec ff_libcavs_decoder;
extern AVCodec ff_cavs_decoder;
extern AVCodec ff_cdgraphics_decoder;
extern AVCodec ff_cdtoons_decoder;
@@ -769,6 +770,7 @@
extern AVCodec ff_libxavs2_encoder;
extern AVCodec ff_libxvid_encoder;
extern AVCodec ff_libzvbi_teletext_decoder;
+extern AVCodec ff_libdraplus_decoder;
/* text */
extern AVCodec ff_bintext_decoder;
diff -ruN ffmpeg-4.4/libavcodec/codec_desc.c ffmpeg_cavs_dra-4.4/libavcodec/codec_desc.c
--- ffmpeg-4.4/libavcodec/codec_desc.c 2021-04-09 05:28:39.000000000 +0800
+++ ffmpeg_cavs_dra-4.4/libavcodec/codec_desc.c 2021-05-27 19:23:53.348754000 +0800
@@ -3028,6 +3028,13 @@
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
},
{
+ .id = AV_CODEC_ID_DRA,
+ .type = AVMEDIA_TYPE_AUDIO,
+ .name = "dra",
+ .long_name = NULL_IF_CONFIG_SMALL("dra audio decoder"),
+ .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
+ },
+ {
.id = AV_CODEC_ID_FFWAVESYNTH,
.type = AVMEDIA_TYPE_AUDIO,
.name = "wavesynth",
diff -ruN ffmpeg-4.4/libavcodec/codec_id.h ffmpeg_cavs_dra-4.4/libavcodec/codec_id.h
--- ffmpeg-4.4/libavcodec/codec_id.h 2021-04-09 05:28:39.000000000 +0800
+++ ffmpeg_cavs_dra-4.4/libavcodec/codec_id.h 2021-05-27 14:45:31.711676000 +0800
@@ -489,6 +489,7 @@
AV_CODEC_ID_ON2AVC,
AV_CODEC_ID_DSS_SP,
AV_CODEC_ID_CODEC2,
+ AV_CODEC_ID_DRA,
AV_CODEC_ID_FFWAVESYNTH = 0x15800,
AV_CODEC_ID_SONIC,
diff -ruN ffmpeg-4.4/libavcodec/libcavsdec.c ffmpeg_cavs_dra-4.4/libavcodec/libcavsdec.c
--- ffmpeg-4.4/libavcodec/libcavsdec.c 1970-01-01 08:00:00.000000000 +0800
+++ ffmpeg_cavs_dra-4.4/libavcodec/libcavsdec.c 2021-05-27 15:32:00.931451000 +0800
@@ -0,0 +1,805 @@
+/*
+ * Chinese AVS video (AVS1-P2, JiZhun profile, frame and field) decoder.
+ * Chinese AVS video (AVS1-P16, GuanDian profile, frame and field) decoder.
+ * Copyright (c) 2013
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+#include "libavutil/avassert.h"
+#include "avcodec.h"
+#include "internal.h"
+#include "mpeg12data.h"
+#include "mpegvideo.h"
+#include "libcavs.h"
+
+#define SLICE_MAX_START_CODE 0x000001af
+#define EXT_START_CODE 0x000001b5
+#define USER_START_CODE 0x000001b2
+#define CAVS_START_CODE 0x000001b0
+#define PIC_I_START_CODE 0x000001b3
+#define PIC_PB_START_CODE 0x000001b6
+#define VIDEO_EDIT_CODE 0x000001b7
+
+#define A_AVAIL 1
+#define B_AVAIL 2
+#define C_AVAIL 4
+#define D_AVAIL 8
+#define NOT_AVAIL -1
+#define REF_INTRA -2
+#define REF_DIR -3
+
+#define ESCAPE_CODE 59
+
+#define FWD0 0x01
+#define FWD1 0x02
+#define BWD0 0x04
+#define BWD1 0x08
+#define SYM0 0x10
+#define SYM1 0x20
+#define SPLITH 0x40
+#define SPLITV 0x80
+
+#define MV_BWD_OFFS 12
+#define MV_STRIDE 4
+
+typedef struct AVSFrame {
+ AVFrame *f;
+ int poc;
+} AVSFrame;
+
+typedef struct AVSContext {
+ AVCodecContext *avctx;
+
+ uint8_t *buf; /* decode stream */
+ int length;
+ void* p_decoder; /* decoder handle */
+ int b_interlaced; /* 0:frame 1:field */
+ cavs_param param;
+ int b_probe_flag; /* init as 0, when finish probe set to 1 */
+
+ AVSFrame cur; ///< currently decoded frame
+ AVSFrame DPB[2]; ///< reference frames
+
+ int dist[2]; ///< temporal distances from current frame to ref frames
+ int low_delay;
+ int profile, level;
+ int aspect_ratio;
+ int mb_width, mb_height;
+ int width, height;
+ int stream_revision; ///<0 for samples from 2006, 1 for rm52j encoder
+ int progressive;
+ int pic_structure;
+
+ int stc; ///< last start code
+ uint8_t *top_qp;
+ int got_keyframe;
+ int probe_keyframe;
+
+ int output_type; /* mark type of output frame */
+ int b_delay_frame;
+ int b_last_delay_frame;
+
+ int last_frame_error; /* default 0 */
+ int last_frame_type;
+} AVSContext;
+
+int ff_libcavs_init(AVCodecContext *avctx);
+int ff_libcavs_end (AVCodecContext *avctx);
+
+av_cold int ff_libcavs_init(AVCodecContext *avctx) {
+ AVSContext *h = avctx->priv_data;
+ int i_result;
+
+ h->avctx = avctx;
+ avctx->pix_fmt= AV_PIX_FMT_YUV420P;
+
+ h->cur.f = av_frame_alloc();
+ h->DPB[0].f = av_frame_alloc();
+ h->DPB[1].f = av_frame_alloc();
+
+ if (!h->cur.f || !h->DPB[0].f || !h->DPB[1].f) {
+ ff_libcavs_end(avctx);
+ return AVERROR(ENOMEM);
+ }
+
+ /* creat decoder */
+ h->param.b_accelerate = 1;
+ i_result = cavs_decoder_create( &h->p_decoder, &h->param );
+ if( h->p_decoder == NULL || i_result != 0 )
+ {
+ return -1;
+ }
+
+ /*init multi-thread*/
+ cavs_decoder_thread_param_init( h->p_decoder );
+
+ /* alloc buf for decode */
+ h->buf = (unsigned char *)malloc(MAX_CODED_FRAME_SIZE*sizeof(unsigned char));
+ memset(h->buf, 0, MAX_CODED_FRAME_SIZE*sizeof(unsigned char));
+
+ /* init probe flag */
+ h->b_probe_flag = 0;
+ h->b_last_delay_frame = 0;
+ h->b_delay_frame = 0;
+
+ h->last_frame_error= 0;
+ h->probe_keyframe = 0;
+
+ return 0;
+}
+
+av_cold int ff_libcavs_end(AVCodecContext *avctx) {
+ AVSContext *h = avctx->priv_data;
+
+ av_frame_free(&h->cur.f);
+ av_frame_free(&h->DPB[0].f);
+ av_frame_free(&h->DPB[1].f);
+
+ free( h->buf );
+ cavs_decoder_destroy( h->p_decoder );
+ cavs_decoder_buffer_end( &h->param );
+
+ return 0;
+}
+
+
+
+/*****************************************************************************
+ *
+ * frame level
+ *
+ ****************************************************************************/
+
+static int decoder_get_cur_frame( AVFrame *frame, cavs_param * param)
+{
+ int width;
+ int height;
+ int linesize;
+ int i;
+ uint8_t *dst_y, *dst_u, *dst_v;
+ uint8_t *p_yuv;
+
+ width = param->seqsize.lWidth;
+ height = param->seqsize.lHeight;
+
+ /* Y */
+ dst_y = frame->data[0];
+ p_yuv = param->p_out_yuv[0];
+ linesize = frame->linesize[0];
+ for( i = 0; i < height; i++ )
+ {
+ memcpy( dst_y, p_yuv, width);
+ dst_y += linesize;
+ p_yuv += width;
+ }
+
+ /* U */
+ dst_u = frame->data[1];
+ p_yuv = param->p_out_yuv[1];
+ linesize = frame->linesize[1];
+ for( i = 0; i < (height>>1); i++ )
+ {
+ memcpy( dst_u, p_yuv, width>>1);
+ dst_u += linesize;
+ p_yuv += (width>>1);
+ }
+
+ /* V */
+ dst_v = frame->data[2];
+ p_yuv = param->p_out_yuv[2];
+ linesize = frame->linesize[2];
+ for( i = 0; i < (height>>1); i++ )
+ {
+ memcpy( dst_v, p_yuv, width>>1);
+ dst_v += linesize;
+ p_yuv += (width>>1);
+ }
+
+ return 0;
+}
+
+static int cavs_decode_pic(AVSContext *h, int *ret_val)
+{
+ int ret;
+ int i_result;
+
+ if( h->param.b_accelerate )
+ {
+ i_result = cavs_decode_one_frame( h->p_decoder, h->stc, &h->param, h->buf, h->length );
+ av_frame_unref(h->cur.f);
+
+ h->output_type = h->param.output_type;
+ switch( h->output_type )
+ {
+ case 0: /* I-frame */
+ h->output_type = AV_PICTURE_TYPE_I;
+ break;
+ case 1: /* P-frame */
+ h->output_type = 1 + AV_PICTURE_TYPE_I;
+ break;
+ case 2: /* B-frame */
+ h->output_type = 2 + AV_PICTURE_TYPE_I;
+ break;
+ default:
+ ;
+ }
+
+ if( h->output_type == -1 && i_result == 0 )
+ return 0;
+
+ if ((ret = ff_get_buffer(h->avctx, h->cur.f,
+ h->output_type == AV_PICTURE_TYPE_B ?
+ 0 : AV_GET_BUFFER_FLAG_REF)) < 0)
+ return ret;
+
+ /* set h->cur with decoded image */
+ if( i_result == CAVS_FRAME_OUT )
+ {
+ decoder_get_cur_frame( h->cur.f, &h->param );
+
+ if ( h->output_type != AV_PICTURE_TYPE_B )
+ {
+ av_frame_unref(h->DPB[1].f);
+ FFSWAP(AVSFrame, h->cur, h->DPB[1]);
+ FFSWAP(AVSFrame, h->DPB[0], h->DPB[1]);
+ }
+ else /* B frame */
+ {
+ decoder_get_cur_frame( h->cur.f, &h->param );
+ }
+ }
+ }
+ else
+ {
+ i_result = cavs_decode_one_frame( h->p_decoder, h->stc, &h->param, h->buf, h->length );
+ av_frame_unref(h->cur.f);
+
+ if (h->stc == PIC_PB_START_CODE) {
+ h->cur.f->pict_type = cavs_decoder_cur_frame_type( h->p_decoder ) + AV_PICTURE_TYPE_I;
+ if (h->cur.f->pict_type > AV_PICTURE_TYPE_B) {
+ av_log(h->avctx, AV_LOG_ERROR, "illegal picture type\n");
+ printf("illegal picture type\n");
+ return -1;
+ }
+ } else {
+ h->cur.f->pict_type = AV_PICTURE_TYPE_I;
+ }
+
+ if ((ret = ff_get_buffer(h->avctx, h->cur.f,
+ h->cur.f->pict_type == AV_PICTURE_TYPE_B ?
+ 0 : AV_GET_BUFFER_FLAG_REF)) < 0)
+ return ret;
+
+ /* set h->cur with decoded image */
+ if( i_result == CAVS_FRAME_OUT )
+ {
+ decoder_get_cur_frame( h->cur.f, &h->param );
+
+ if (h->cur.f->pict_type != AV_PICTURE_TYPE_B)
+ {
+ av_frame_unref(h->DPB[1].f);
+ FFSWAP(AVSFrame, h->cur, h->DPB[1]);
+ FFSWAP(AVSFrame, h->DPB[0], h->DPB[1]);
+ }
+ else /* B frame */
+ {
+ decoder_get_cur_frame( h->cur.f, &h->param );
+ }
+ }
+ }
+
+ *ret_val = i_result;
+
+ return 0;
+}
+
+/*****************************************************************************
+ *
+ * headers and interface
+ *
+ ****************************************************************************/
+
+static int cavs_decode_seq_header(AVSContext *h)
+{
+ int frame_rate_code;
+ int width, height;
+ cavs_seq_info si;
+
+ cavs_decoder_process( h->p_decoder, h->buf, h->length );
+
+ cavs_decoder_get_seq( h->p_decoder, &si);
+
+ h->b_interlaced = si.b_interlaced;
+ h->profile = si.profile;
+ h->level = si.level;
+ width = si.lWidth;
+ height = si.lHeight;
+ if ((h->width || h->height) && (h->width != width || h->height != height)) {
+ avpriv_report_missing_feature(h->avctx,
+ "Width/height changing in BAVS");
+ return AVERROR_PATCHWELCOME;
+ }
+ if (width <= 0 || height <= 0) {
+ av_log(h->avctx, AV_LOG_ERROR, "Dimensions invalid\n");
+ return AVERROR_INVALIDDATA;
+ }
+ h->width = width;
+ h->height = height;
+ h->aspect_ratio = si.aspect_ratio;
+ frame_rate_code = si.frame_rate_code;
+ h->low_delay = si.low_delay;
+ h->mb_width = (h->width + 15) >> 4;
+ h->mb_height = (h->height + 15) >> 4;
+ h->avctx->time_base.den = ff_mpeg12_frame_rate_tab[frame_rate_code].num;
+ h->avctx->time_base.num = ff_mpeg12_frame_rate_tab[frame_rate_code].den;
+ h->avctx->width = h->width;
+ h->avctx->height = h->height;
+
+ h->cur.f->interlaced_frame = h->b_interlaced;
+ h->DPB[0].f->interlaced_frame = h->b_interlaced;
+ h->DPB[1].f->interlaced_frame = h->b_interlaced;
+
+ return 0;
+}
+
+static int cavs_decode_user_data(AVSContext *h)
+{
+ cavs_decoder_process( h->p_decoder, h->buf, h->length );
+
+ return 0;
+}
+
+static int cavs_decode_extension_data(AVSContext *h)
+{
+ cavs_decoder_process( h->p_decoder, h->buf, h->length );
+
+ return 0;
+}
+
+static void cavs_flush(AVCodecContext * avctx)
+{
+ AVSContext *h = avctx->priv_data;
+ h->got_keyframe = 0;
+}
+
+static int cavs_decoder_param_init( AVSContext *h )
+{
+ cavs_param *param = &h->param;
+
+ //param->b_interlaced = h->b_interlaced; /* frame or field decision at probe stage */
+ param->cpu = 0;
+ param->i_color_space = CAVS_CS_YUV420; /*only support 420*/
+ //param->i_thread_model = 0; /* don't modify!! 1:multi-threads 0:single( new acceleration ) */
+ param->i_thread_num = 64; /* don't modify!! at most */
+ param->seqsize.lWidth = h->width;
+ param->seqsize.lHeight = h->height;
+ param->seqsize.lWidth = h->width;
+ param->seqsize.lHeight = h->height;
+ param->output_type = -1; /* -1 init, I-0, P-1 B-2 */
+
+ return 0;
+}
+
+#define STREAM_DATA_MAX 3000000
+
+static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
+ AVPacket *avpkt)
+{
+ AVSContext *h = avctx->priv_data;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ uint32_t stc = -1;
+ int ret = 0;
+ uint8_t *buf_end;
+ uint8_t *buf_ptr;
+ int i_pass_idr = 0;
+ int b_delay_out = 0;
+ int i_first_adr = 0;
+
+ /* probe frame or field decoded format */
+ if( !h->b_probe_flag && buf_size != 0 ) /* first probe flag, when finish set it to 1 */
+ {
+ uint8_t *p_buffer;//[STREAM_DATA_MAX];
+ uint8_t *buf_ptr_start;
+ uint8_t *buf_cur, *buf_cur_end;
+ int probe_size;
+ int decode_size;
+
+ probe_size = buf_size;
+ decode_size = probe_size;
+
+ /* copy stream */
+ p_buffer = (uint8_t*)malloc(buf_size);
+
+ memcpy( p_buffer, buf, probe_size );
+
+ buf_ptr_start = p_buffer; /* flag start address */
+ buf_cur = p_buffer; /* used to cal */
+ buf_cur_end = buf_cur + probe_size;
+
+ while( !h->b_probe_flag )
+ {
+ buf_cur = (uint8_t*)avpriv_find_start_code((const uint8_t*)buf_cur, (const uint8_t*)buf_cur_end, &stc);
+ if ((stc & 0xFFFFFE00) || buf_cur == buf_cur_end)
+ {
+ return FFMAX(0, buf_cur - p_buffer);
+ }
+
+ decode_size = buf_cur_end - buf_cur + 4;
+
+ switch(stc)
+ {
+ case CAVS_START_CODE:
+ cavs_decoder_init_stream( h->p_decoder, buf_cur - 4, decode_size);
+ cavs_decoder_get_one_nal( h->p_decoder, h->buf, &h->length );
+ ret = cavs_decoder_probe_seq( h->p_decoder, h->buf, h->length );
+ if(ret == CAVS_ERROR )
+ {
+ break;
+ }
+
+ break;
+ case PIC_I_START_CODE:
+ cavs_decoder_init_stream( h->p_decoder, buf_cur - 4, decode_size);
+ cavs_decoder_get_one_nal( h->p_decoder, h->buf, &h->length );
+ ret = cavs_decoder_pic_header( h->p_decoder, h->buf, h->length, &h->param, stc );
+ if( ret == CAVS_ERROR )
+ {
+ break;
+ }
+ cavs_decoder_set_format_type( h->p_decoder, &h->param );
+
+ /* finish probe flag */
+ h->b_probe_flag = 1;
+ if(!h->probe_keyframe )
+ {
+ h->probe_keyframe = 1;
+ }
+
+ break;
+
+ case PIC_PB_START_CODE:
+ if(!h->probe_keyframe )
+ {
+ break;
+ }
+ cavs_decoder_init_stream( h->p_decoder, buf_cur - 4, decode_size);
+ cavs_decoder_get_one_nal( h->p_decoder, h->buf, &h->length );
+ ret = cavs_decoder_pic_header( h->p_decoder, h->buf, h->length, &h->param, stc );
+ if( ret == CAVS_ERROR )
+ {
+ break;
+ }
+ cavs_decoder_set_format_type( h->p_decoder, &h->param );
+
+ /* finish probe flag */
+ h->b_probe_flag = 1;
+ break;
+
+ case EXT_START_CODE:
+
+ cavs_decoder_init_stream( h->p_decoder, buf_cur - 4, decode_size);
+ cavs_decoder_get_one_nal( h->p_decoder, h->buf, &h->length );
+
+ cavs_decode_extension_data( h );
+
+ break;
+
+ case USER_START_CODE:
+ cavs_decoder_init_stream( h->p_decoder, buf_cur - 4, decode_size);
+ cavs_decoder_get_one_nal( h->p_decoder, h->buf, &h->length );
+
+ cavs_decode_extension_data( h );
+
+ break;
+
+ case VIDEO_EDIT_CODE:
+ cavs_decoder_init_stream( h->p_decoder, buf_cur - 4, decode_size);
+ cavs_decoder_get_one_nal( h->p_decoder, h->buf, &h->length );
+
+ break;
+ default:
+ if (stc <= SLICE_MAX_START_CODE) {
+ }
+ break;
+ }
+ }
+
+ free(p_buffer);
+ }
+
+ if (buf_size == 0) {
+
+ if( h->param.b_accelerate )
+ {
+ int ret = 0;
+
+ /* when last frame is IDR */
+ if(!h->b_last_delay_frame)
+ {
+ h->b_last_delay_frame = 1;
+ ret = cavs_decode_one_frame_delay( h->p_decoder, &h->param );
+
+ h->output_type = h->param.output_type;
+
+ if( ret == CAVS_FRAME_OUT )
+ {
+
+
+ av_frame_unref(h->cur.f);
+ if ((ret = ff_get_buffer(h->avctx, h->cur.f,
+ h->output_type == AV_PICTURE_TYPE_B ?
+ 0 : AV_GET_BUFFER_FLAG_REF)) < 0)
+ return ret;
+
+ decoder_get_cur_frame( h->cur.f, &h->param );
+ *got_frame = 1;
+ av_frame_move_ref(data, h->cur.f);
+
+ ((AVFrame*)data)->interlaced_frame = h->b_interlaced;
+
+ return 0;
+ }
+ }
+ }
+
+ if (!h->low_delay && h->DPB[0].f->data[0]) {
+ if(cavs_out_delay_frame_end( h->p_decoder, h->param.p_out_yuv) )
+ {
+
+ decoder_get_cur_frame( h->DPB[0].f, &h->param );
+ *got_frame = 1;
+ av_frame_move_ref(data, h->DPB[0].f);
+ ((AVFrame*)data)->interlaced_frame = h->b_interlaced;
+ }
+ }
+
+ return 0;
+ }
+
+ buf_ptr = (uint8_t*)buf;
+ buf_end = (uint8_t*)(buf + buf_size);
+
+ for(;;) {
+
+ int decode_size;
+
+ if(!i_first_adr)
+ {
+ i_first_adr = 1;
+ }
+
+ buf_ptr = (uint8_t*)avpriv_find_start_code((const uint8_t*)buf_ptr, (const uint8_t*)buf_end, &stc);
+
+ if ((stc & 0xFFFFFE00) || buf_ptr == buf_end)
+ {
+ return FFMAX(0, buf_ptr - buf);
+ }
+
+ decode_size = buf_end - buf_ptr + 4;
+
+ switch (stc) {
+ case CAVS_START_CODE:
+ cavs_decoder_init_stream( h->p_decoder, buf_ptr - 4, decode_size);
+ cavs_decoder_get_one_nal( h->p_decoder, h->buf, &h->length );
+ cavs_decode_seq_header( h );
+
+ /* init h->param */
+ cavs_decoder_param_init( h );
+
+ if( h->param.seq_header_flag == 0 )
+ {
+ /* NOTE : must call at first seq header */
+ cavs_decoder_seq_init( h->p_decoder, &h->param );
+
+ /* alloc frame for decoded yuv */
+ if (cavs_decoder_buffer_init(&h->param) < 0)
+ break;
+
+ h->param.seq_header_flag = 1;
+ }
+ else
+ {
+ if( h->param.b_accelerate )
+ {
+ h->b_delay_frame = 0; // xun
+ if( h->last_frame_error )
+ {
+ /* reset pipeline */
+ cavs_decoder_seq_header_reset_pipeline( h->p_decoder );
+ h->b_delay_frame = 0;
+ }
+ }
+#if 0 //xun
+ else
+ {
+ //output final p frame if bframe num != 0
+ if ( cavs_out_delay_frame( h->p_decoder, h->param.p_out_yuv) )
+ {
+ b_delay_out = 1; /* will output this frame after current frame decoded */
+ }
+ }
+#endif
+ }
+
+ if( h->last_frame_error ) /* error end */
+ {
+ h->last_frame_error = 0;
+ }
+ break;
+ case PIC_I_START_CODE:
+ cavs_decoder_init_stream( h->p_decoder, buf_ptr - 4, decode_size);
+ cavs_decoder_get_one_nal( h->p_decoder, h->buf, &h->length );
+ if (!h->got_keyframe) {
+ av_frame_unref(h->DPB[0].f);
+ av_frame_unref(h->DPB[1].f);
+ h->got_keyframe = 1;
+ }
+ i_pass_idr = 1;
+ if( h->last_frame_error ) /* error end */
+ {
+ h->last_frame_error = 0;
+ }
+ case PIC_PB_START_CODE:
+ if( !i_pass_idr )
+ {
+ cavs_decoder_init_stream( h->p_decoder, buf_ptr - 4, decode_size);
+ cavs_decoder_get_one_nal( h->p_decoder, h->buf, &h->length );
+ i_pass_idr = 0;
+ if( h->last_frame_error )
+ {
+ *got_frame = 0;
+ return 0;
+ }
+ }
+
+ *got_frame = 0;
+ if (!h->got_keyframe)
+ break;
+ h->stc = stc;
+#if 0
+ if (cavs_decode_pic(h, &ret))
+ {
+ break;
+ }
+#else
+ cavs_decode_pic(h, &ret);
+ if( ret == CAVS_ERROR )
+ {
+ h->last_frame_error = 1;
+ h->got_keyframe = 0;
+ break;
+ }
+
+#endif
+ if( ret == CAVS_FRAME_OUT )
+ {
+ *got_frame = 1;
+ }
+
+ if( h->param.b_accelerate ) /* output frame according to reconstructed order */
+ {
+ if( h->output_type != AV_PICTURE_TYPE_B )
+ {
+ if (h->DPB[0].f->data[0] && *got_frame == 1)
+ {
+ if ((ret = av_frame_ref(data, h->DPB[0].f)) < 0)
+ {
+ return ret;
+ }
+ ((AVFrame*)data)->interlaced_frame = h->b_interlaced;
+ }
+ else
+ {
+ {
+ *got_frame = 0;
+ }
+ }
+ }
+ else /* B-frame, output */
+ {
+ if(h->output_type == AV_PICTURE_TYPE_B && *got_frame == 1)
+ {
+ av_frame_move_ref(data, h->cur.f);
+ ((AVFrame*)data)->interlaced_frame = h->b_interlaced;
+ }
+ }
+ }
+ else
+ {
+ if (h->cur.f->pict_type != AV_PICTURE_TYPE_B)
+ {
+ if (h->DPB[0].f->data[0] && *got_frame == 1)
+ {
+ if ((ret = av_frame_ref(data, h->DPB[0].f)) < 0)
+ {
+ return ret;
+ }
+ ((AVFrame*)data)->interlaced_frame = h->b_interlaced;
+ }
+ else
+ {
+ if( b_delay_out )
+ {
+ b_delay_out = 0;
+
+ /* set h->cur.f */
+ decoder_get_cur_frame( h->cur.f, &h->param );
+
+ *got_frame = 1;
+ av_frame_move_ref(data, h->cur.f);
+ ((AVFrame*)data)->interlaced_frame = h->b_interlaced;
+ }
+ else
+ {
+ *got_frame = 0;
+ }
+ }
+ }
+ else /* B-frame, output */
+ {
+ if(*got_frame == 1)
+ {
+ av_frame_move_ref(data, h->cur.f);
+ ((AVFrame*)data)->interlaced_frame = h->b_interlaced;
+ }
+ }
+ }
+
+ break;
+ case EXT_START_CODE:
+ cavs_decoder_init_stream( h->p_decoder, buf_ptr - 4, decode_size);
+ cavs_decoder_get_one_nal( h->p_decoder, h->buf, &h->length );
+
+ cavs_decode_extension_data( h );
+
+ break;
+ case USER_START_CODE:
+ cavs_decoder_init_stream( h->p_decoder, buf_ptr - 4, decode_size);
+ cavs_decoder_get_one_nal( h->p_decoder, h->buf, &h->length );
+
+ cavs_decode_extension_data( h );
+
+ break;
+
+ case VIDEO_EDIT_CODE:
+ cavs_decoder_init_stream( h->p_decoder, buf_ptr - 4, decode_size);
+ cavs_decoder_get_one_nal( h->p_decoder, h->buf, &h->length );
+
+ break;
+ default:
+ if (stc <= SLICE_MAX_START_CODE) {
+ }
+ break;
+ }
+ }
+}
+
+AVCodec ff_libcavs_decoder = {
+ .name = "libcavs",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_CAVS,
+ .priv_data_size = sizeof(AVSContext),
+ .init = ff_libcavs_init,
+ .close = ff_libcavs_end,
+ .decode = cavs_decode_frame,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
+ .flush = cavs_flush,
+ .long_name = NULL_IF_CONFIG_SMALL(" Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile) and (AVS1-P16, Guangdian profile)"),
+};
diff -ruN ffmpeg-4.4/libavcodec/libdraplusdec.c ffmpeg_cavs_dra-4.4/libavcodec/libdraplusdec.c
--- ffmpeg-4.4/libavcodec/libdraplusdec.c 1970-01-01 08:00:00.000000000 +0800
+++ ffmpeg_cavs_dra-4.4/libavcodec/libdraplusdec.c 2021-05-27 14:47:12.620536000 +0800
@@ -0,0 +1,180 @@
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <memory.h>
+#include <time.h>
+#include "avcodec.h"
+#include "internal.h"
+#include "DRAPlusDec.h"
+
+#define __min(a,b) (((a) < (b)) ? (a) : (b))
+
+typedef struct DRAContext
+{
+ void *pDRADecoder;
+}DRAContext;
+
+static av_cold int dra_decode_init(AVCodecContext *avctx)
+{
+ struct DRAContext *s = avctx->priv_data;
+
+ avctx->frame_size = 1024;
+ avctx->channels = 0;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+
+ s->pDRADecoder = DRAPlusDecCreate();
+ if(s->pDRADecoder == NULL)
+ {
+ return 1;
+ }
+
+ return 0;
+}
+
+static int dra_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
+{
+ int ret = 0;
+
+ uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ AVFrame *frame = data;
+ int dec_len = 0;
+ DRAPlusFrameInfo dra_frame_info;
+
+ struct DRAContext *s = avctx->priv_data;
+
+ unsigned char *pcm_data = NULL;
+ int pcm_len = 0;
+
+ *got_frame_ptr = 0;
+
+ if(buf == NULL || buf_size == 0)
+ {
+ ret = DRAPlusDecRecvFrame(s->pDRADecoder, &pcm_data, &pcm_len);
+ if(ret == 0)
+ {
+ DRAPlusDecGetFrameInfo(s->pDRADecoder, &dra_frame_info);
+ avctx->sample_rate = dra_frame_info.nSampleRate;
+ avctx->channels = dra_frame_info.nChannels;
+ avctx->channel_layout = av_get_default_channel_layout(avctx->channels);
+ if(avctx->channels != 0)
+ {
+ avctx->frame_size = pcm_len / (avctx->channels * 2);
+ }
+
+ frame->channels = avctx->channels;
+ frame->channel_layout = avctx->channel_layout;
+ frame->sample_rate = avctx->sample_rate;
+ frame->nb_samples = avctx->frame_size;
+ frame->format = avctx->sample_fmt;
+
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+ return ret;
+
+ memcpy(frame->data[0], pcm_data, pcm_len);
+
+ *got_frame_ptr = 1;
+ }
+ dec_len = buf_size;
+ }
+ else
+ {
+ ret = DRAPlusDecRecvFrame(s->pDRADecoder, &pcm_data, &pcm_len);
+ if(ret == 0)
+ {
+ DRAPlusDecGetFrameInfo(s->pDRADecoder, &dra_frame_info);
+ avctx->sample_rate = dra_frame_info.nSampleRate;
+ avctx->channels = dra_frame_info.nChannels;
+ avctx->channel_layout = av_get_default_channel_layout(avctx->channels);
+ if(avctx->channels != 0)
+ {
+ avctx->frame_size = pcm_len / (avctx->channels * 2);
+ }
+
+ frame->channels = avctx->channels;
+ frame->channel_layout = avctx->channel_layout;
+ frame->sample_rate = avctx->sample_rate;
+ frame->nb_samples = avctx->frame_size;
+ frame->format = avctx->sample_fmt;