diff --git a/src/ffmpeg/patches/FFmpeg_OMAF.patch b/src/ffmpeg/patches/FFmpeg_OMAF.patch index 7624f4a..14c22cd 100644 --- a/src/ffmpeg/patches/FFmpeg_OMAF.patch +++ b/src/ffmpeg/patches/FFmpeg_OMAF.patch @@ -1,11 +1,11 @@ diff -Nur FFmpeg/.gitattributes FFmpeg_patched/.gitattributes ---- FFmpeg/.gitattributes 2022-06-27 05:54:59.267543580 +0000 +--- FFmpeg/.gitattributes 2022-06-29 07:15:48.287919033 +0000 +++ FFmpeg_patched/.gitattributes 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -*.pnm -diff -text -tests/ref/fate/sub-scc eol=crlf diff -Nur FFmpeg/.gitignore FFmpeg_patched/.gitignore ---- FFmpeg/.gitignore 2022-06-27 05:54:59.267543580 +0000 +--- FFmpeg/.gitignore 2022-06-29 07:15:48.287919033 +0000 +++ FFmpeg_patched/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -*.a @@ -49,8 +49,8 @@ diff -Nur FFmpeg/.gitignore FFmpeg_patched/.gitignore -/tools/python/__pycache__/ diff -Nur FFmpeg/DASH_packing_sample/DASH_packing_sample.c FFmpeg_patched/DASH_packing_sample/DASH_packing_sample.c --- FFmpeg/DASH_packing_sample/DASH_packing_sample.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/DASH_packing_sample.c 2022-06-27 05:52:13.451545551 +0000 -@@ -0,0 +1,571 @@ ++++ FFmpeg_patched/DASH_packing_sample/DASH_packing_sample.c 2022-06-29 07:16:09.587918780 +0000 +@@ -0,0 +1,589 @@ +#include +#include +#include @@ -73,6 +73,8 @@ diff -Nur FFmpeg/DASH_packing_sample/DASH_packing_sample.c FFmpeg_patched/DASH_p +#define H265_NAL_TYPE_PPS 34 +#define H265_NAL_TYPE_PREFIX_SEI 39 + ++extern int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size, int64_t min_size); ++ +int32_t find_next_start_code(const uint8_t *buf, const uint8_t *next_avc, int32_t *startCodesNum) +{ + int32_t i = 0; @@ -361,7 +363,6 @@ diff -Nur FFmpeg/DASH_packing_sample/DASH_packing_sample.c FFmpeg_patched/DASH_p +{ + DASH_CONTEXT *dash_context = inPointer; + int32_t ret = 0; -+ int32_t gotPacket = 0; + + for (uint8_t stream_id = 1; stream_id <= dash_params->in_videos_num; stream_id++) + { @@ -433,11 +434,9 @@ diff -Nur FFmpeg/DASH_packing_sample/DASH_packing_sample.c FFmpeg_patched/DASH_p + +int32_t PackStreams(DASH_IN_PARAM *dash_params) +{ -+ int32_t ret; -+ int32_t have_video = 0; -+ int32_t encode_video = 0; ++ int32_t ret = 0; ++ size_t ret1 = 0; + uint32_t streams_num = dash_params->in_videos_num; -+ uint64_t packing_frames_cnt = dash_params->packing_frames_num; + FILE* streams_file[1024] = { NULL }; + FILE* frame_len_file[1024] = { NULL }; + @@ -483,12 +482,20 @@ diff -Nur FFmpeg/DASH_packing_sample/DASH_packing_sample.c FFmpeg_patched/DASH_p + int32_t frame_rate = dash_params->videos_param[0].frame_rate; + int32_t frame_dur = (int32_t)((1000000 / frame_rate) / 2); + frame_dur = (frame_dur / 100 - 1) * 100; -+ //printf("will usleep %d us !\n", frame_dur); + usleep(frame_dur); + } + -+ fscanf(frame_len_file[stream_id - 1], "%d,", &(frame_data_size[stream_id - 1])); -+ fread(video_frame_data[stream_id - 1], 1, frame_data_size[stream_id - 1], streams_file[stream_id - 1]); ++ ret = fscanf(frame_len_file[stream_id - 1], "%d,", &(frame_data_size[stream_id - 1])); ++ if (ret == -1) ++ { ++ printf("frame data size file has EOF !\n"); ++ } ++ ++ ret1 = fread(video_frame_data[stream_id - 1], 1, frame_data_size[stream_id - 1], streams_file[stream_id - 1]); ++ if (ret1 < frame_data_size[stream_id - 1]) ++ { ++ printf("Error in reading frame data, waiting for next judgement !\n"); ++ } + + if (feof(frame_len_file[stream_id - 1]) && feof(streams_file[stream_id - 1])) + { @@ -511,8 +518,19 @@ diff -Nur FFmpeg/DASH_packing_sample/DASH_packing_sample.c FFmpeg_patched/DASH_p + goto now_free; + } + -+ fscanf(frame_len_file[stream_id - 1], "%d,", &(frame_data_size[stream_id - 1])); -+ fread(video_frame_data[stream_id - 1], 1, frame_data_size[stream_id - 1], streams_file[stream_id - 1]); ++ ret = fscanf(frame_len_file[stream_id - 1], "%d,", &(frame_data_size[stream_id - 1])); ++ if (ret == -1) ++ { ++ printf("frame data size file has EOF !\n"); ++ goto now_free; ++ } ++ ++ ret1 = fread(video_frame_data[stream_id - 1], 1, frame_data_size[stream_id - 1], streams_file[stream_id - 1]); ++ if (ret1 < frame_data_size[stream_id - 1]) ++ { ++ printf("Error in reading frame data !\n"); ++ goto now_free; ++ } + } + else if (!feof(frame_len_file[stream_id - 1]) && feof(streams_file[stream_id - 1])) + { @@ -624,7 +642,7 @@ diff -Nur FFmpeg/DASH_packing_sample/DASH_packing_sample.c FFmpeg_patched/DASH_p +} diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/CMakeLists.txt FFmpeg_patched/DASH_packing_sample/ParsePackingParam/CMakeLists.txt --- FFmpeg/DASH_packing_sample/ParsePackingParam/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/CMakeLists.txt 2022-06-27 05:52:13.451545551 +0000 ++++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/CMakeLists.txt 2022-06-29 07:16:09.587918780 +0000 @@ -0,0 +1,30 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.8) +PROJECT(ParsePackingParam) @@ -658,7 +676,7 @@ diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/CMakeLists.txt FFmpeg_pat +INSTALL(FILES ${PROJECT_SOURCE_DIR}/ParsePackingParam.pc DESTINATION lib/pkgconfig) diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/PackingParamsDef.h FFmpeg_patched/DASH_packing_sample/ParsePackingParam/PackingParamsDef.h --- FFmpeg/DASH_packing_sample/ParsePackingParam/PackingParamsDef.h 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/PackingParamsDef.h 2022-06-27 05:52:13.451545551 +0000 ++++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/PackingParamsDef.h 2022-06-29 07:16:09.587918780 +0000 @@ -0,0 +1,67 @@ +#include +#include @@ -729,7 +747,7 @@ diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/PackingParamsDef.h FFmpeg +#endif diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/ParamParser.cpp FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParamParser.cpp --- FFmpeg/DASH_packing_sample/ParsePackingParam/ParamParser.cpp 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParamParser.cpp 2022-06-27 05:52:13.451545551 +0000 ++++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParamParser.cpp 2022-06-29 07:16:09.587918780 +0000 @@ -0,0 +1,300 @@ +#include "ParamParser.h" +#include "tinyxml2.h" @@ -1033,7 +1051,7 @@ diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/ParamParser.cpp FFmpeg_pa +} diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/ParamParser.h FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParamParser.h --- FFmpeg/DASH_packing_sample/ParsePackingParam/ParamParser.h 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParamParser.h 2022-06-27 05:52:13.451545551 +0000 ++++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParamParser.h 2022-06-29 07:16:09.587918780 +0000 @@ -0,0 +1,19 @@ +#include + @@ -1056,7 +1074,7 @@ diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/ParamParser.h FFmpeg_patc +#endif /* _PARAMPARSER_H_ */ diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/ParsePackingParam.pc FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParsePackingParam.pc --- FFmpeg/DASH_packing_sample/ParsePackingParam/ParsePackingParam.pc 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParsePackingParam.pc 2022-06-27 05:52:13.451545551 +0000 ++++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParsePackingParam.pc 2022-06-29 07:16:09.587918780 +0000 @@ -0,0 +1,10 @@ +prefix=/usr/local +exec_prefix=${prefix} @@ -1070,7 +1088,7 @@ diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/ParsePackingParam.pc FFmp +Libs: -L${libdir} -lParsePackingParam -static-libstdc++ -lpthread -L/usr/local/lib64 diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/ParsePackingParamAPI.h FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParsePackingParamAPI.h --- FFmpeg/DASH_packing_sample/ParsePackingParam/ParsePackingParamAPI.h 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParsePackingParamAPI.h 2022-06-27 05:52:13.451545551 +0000 ++++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParsePackingParamAPI.h 2022-06-29 07:16:09.587918780 +0000 @@ -0,0 +1,22 @@ +#ifndef _PARSEPACKINGPARAM_H_ +#define _PARSEPACKINGPARAM_H_ @@ -1096,7 +1114,7 @@ diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/ParsePackingParamAPI.h FF +#endif /* _PARSEPACKINGPARAM_H_ */ diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/ParsePackingParamAPIImpl.cpp FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParsePackingParamAPIImpl.cpp --- FFmpeg/DASH_packing_sample/ParsePackingParam/ParsePackingParamAPIImpl.cpp 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParsePackingParamAPIImpl.cpp 2022-06-27 05:52:13.451545551 +0000 ++++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/ParsePackingParamAPIImpl.cpp 2022-06-29 07:16:09.587918780 +0000 @@ -0,0 +1,34 @@ +#include "ParsePackingParamAPI.h" +#include "ParamParser.h" @@ -1134,7 +1152,7 @@ diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/ParsePackingParamAPIImpl. +} diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/tinyxml2.cpp FFmpeg_patched/DASH_packing_sample/ParsePackingParam/tinyxml2.cpp --- FFmpeg/DASH_packing_sample/ParsePackingParam/tinyxml2.cpp 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/tinyxml2.cpp 2022-06-27 05:52:13.451545551 +0000 ++++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/tinyxml2.cpp 2022-06-29 07:16:09.587918780 +0000 @@ -0,0 +1,2837 @@ +/* +Original code by Lee Thomason (www.grinninglizard.com) @@ -3975,7 +3993,7 @@ diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/tinyxml2.cpp FFmpeg_patch +} // namespace tinyxml2 diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/tinyxml2.h FFmpeg_patched/DASH_packing_sample/ParsePackingParam/tinyxml2.h --- FFmpeg/DASH_packing_sample/ParsePackingParam/tinyxml2.h 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/tinyxml2.h 2022-06-27 05:52:13.451545551 +0000 ++++ FFmpeg_patched/DASH_packing_sample/ParsePackingParam/tinyxml2.h 2022-06-29 07:16:09.587918780 +0000 @@ -0,0 +1,2309 @@ +/* +Original code by Lee Thomason (www.grinninglizard.com) @@ -6288,19 +6306,24 @@ diff -Nur FFmpeg/DASH_packing_sample/ParsePackingParam/tinyxml2.h FFmpeg_patched +#endif // TINYXML2_INCLUDED diff -Nur FFmpeg/DASH_packing_sample/compile.sh FFmpeg_patched/DASH_packing_sample/compile.sh --- FFmpeg/DASH_packing_sample/compile.sh 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/compile.sh 2022-06-27 05:52:13.451545551 +0000 -@@ -0,0 +1,34 @@ ++++ FFmpeg_patched/DASH_packing_sample/compile.sh 2022-06-29 07:16:09.587918780 +0000 +@@ -0,0 +1,38 @@ +#!/bin/sh + ++rm -rf ffmpeg_lib ++rm -rf ParsePackingParam/build ++rm -f *.o ++ +cd ../ +mkdir build_test +cd build_test +export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH -+../configure --prefix=/usr --libdir=/usr/lib --enable-static --disable-shared --enable-gpl --enable-nonfree --disable-optimizations --disable-vaapi --enable-libDistributedEncoder --enable-libVROmafPacking ++../configure --prefix=/usr --libdir=/usr/lib --enable-static --disable-shared --enable-pic --disable-debug --enable-gpl --enable-nonfree --disable-optimizations --disable-vaapi --enable-libDistributedEncoder --enable-libVROmafPacking +make -j$(nproc) +cd .. + +cd DASH_packing_sample ++mkdir ffmpeg_lib +cd ffmpeg_lib +rm -f *.* +cp ../../build_test/libavcodec/libavcodec.a ./ @@ -6321,12 +6344,11 @@ diff -Nur FFmpeg/DASH_packing_sample/compile.sh FFmpeg_patched/DASH_packing_samp +sudo make install +cd ../.. + -+gcc -g -c DASH_packing_sample.c -+gcc -I/usr/include/ -L/usr/local/lib DASH_packing_sample.o -o DASH_packing_sample -L/usr/local/lib -lpthread -lm -llzma -lz -lbz2 /usr/local/lib/libParsePackingParam.so /usr/local/lib/libDistributedEncoder.so /usr/local/lib/libthrift-0.12.0.so ./ffmpeg_lib/libavformat.a ./ffmpeg_lib/libavcodec.a ./ffmpeg_lib/libavutil.a ./ffmpeg_lib/libswscale.a ./ffmpeg_lib/libswresample.a /usr/local/lib/lib360SCVP.so /usr/local/lib/libglog.so.0 /usr/local/lib/libVROmafPacking.so -+ ++gcc -c -z noexecstack -z relro -z now -fstack-protector-strong -fPIE -pie -fPIC -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Wl,-S -Wall -Werror DASH_packing_sample.c ++gcc -I/usr/include/ -L/usr/local/lib DASH_packing_sample.o -o DASH_packing_sample -L/usr/local/lib -z now -fPIE -pie -fPIC -Wl,--gc-sections -Wl,--strip-all -lpthread -lm -llzma -lz /usr/lib64/libbz2.so.1 /usr/local/lib/libParsePackingParam.so /usr/local/lib/libDistributedEncoder.so /usr/local/lib/libthrift-0.12.0.so ./ffmpeg_lib/libavformat.a ./ffmpeg_lib/libavcodec.a ./ffmpeg_lib/libavutil.a ./ffmpeg_lib/libswscale.a ./ffmpeg_lib/libswresample.a /usr/local/lib/lib360SCVP.so -lglog /usr/local/lib/libVROmafPacking.so diff -Nur FFmpeg/DASH_packing_sample/packing_config.xml FFmpeg_patched/DASH_packing_sample/packing_config.xml --- FFmpeg/DASH_packing_sample/packing_config.xml 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/packing_config.xml 2022-06-27 05:52:13.451545551 +0000 ++++ FFmpeg_patched/DASH_packing_sample/packing_config.xml 2022-06-29 07:16:09.587918780 +0000 @@ -0,0 +1,61 @@ + + @@ -6391,7 +6413,7 @@ diff -Nur FFmpeg/DASH_packing_sample/packing_config.xml FFmpeg_patched/DASH_pack + diff -Nur FFmpeg/DASH_packing_sample/readme.txt FFmpeg_patched/DASH_packing_sample/readme.txt --- FFmpeg/DASH_packing_sample/readme.txt 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/DASH_packing_sample/readme.txt 2022-06-27 05:52:13.451545551 +0000 ++++ FFmpeg_patched/DASH_packing_sample/readme.txt 2022-06-29 07:16:09.587918780 +0000 @@ -0,0 +1,10 @@ +How to compile: +./compile.sh @@ -6405,12 +6427,12 @@ diff -Nur FFmpeg/DASH_packing_sample/readme.txt FFmpeg_patched/DASH_packing_samp +... diff -Nur FFmpeg/VERSION FFmpeg_patched/VERSION --- FFmpeg/VERSION 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/VERSION 2022-06-27 05:52:13.243545554 +0000 ++++ FFmpeg_patched/VERSION 2022-06-29 07:16:09.367918783 +0000 @@ -0,0 +1 @@ +4.3.1 diff -Nur FFmpeg/build_ffmpeg_with_cubification.sh FFmpeg_patched/build_ffmpeg_with_cubification.sh --- FFmpeg/build_ffmpeg_with_cubification.sh 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/build_ffmpeg_with_cubification.sh 2022-06-27 05:52:13.591545550 +0000 ++++ FFmpeg_patched/build_ffmpeg_with_cubification.sh 2022-06-29 07:16:09.727918778 +0000 @@ -0,0 +1,19 @@ +#!/bin/bash + @@ -6432,8 +6454,8 @@ diff -Nur FFmpeg/build_ffmpeg_with_cubification.sh FFmpeg_patched/build_ffmpeg_w + #--extra-cxxflags="-fpermissive" \ + diff -Nur FFmpeg/configure FFmpeg_patched/configure ---- FFmpeg/configure 2022-06-27 05:54:59.267543580 +0000 -+++ FFmpeg_patched/configure 2022-06-27 05:52:13.623545549 +0000 +--- FFmpeg/configure 2022-06-29 07:15:48.295919033 +0000 ++++ FFmpeg_patched/configure 2022-06-29 07:16:09.767918778 +0000 @@ -252,6 +252,7 @@ --enable-libopencv enable video filtering via libopencv [no] --enable-libopenh264 enable H.264 encoding via OpenH264 [no] @@ -6588,7 +6610,7 @@ diff -Nur FFmpeg/configure FFmpeg_patched/configure enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg diff -Nur FFmpeg/doc/.gitignore FFmpeg_patched/doc/.gitignore ---- FFmpeg/doc/.gitignore 2022-06-27 05:54:59.083543582 +0000 +--- FFmpeg/doc/.gitignore 2022-06-29 07:15:48.295919033 +0000 +++ FFmpeg_patched/doc/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -/*.1 @@ -6601,12 +6623,12 @@ diff -Nur FFmpeg/doc/.gitignore FFmpeg_patched/doc/.gitignore -/fate.txt -/print_options diff -Nur FFmpeg/doc/doxy/.gitignore FFmpeg_patched/doc/doxy/.gitignore ---- FFmpeg/doc/doxy/.gitignore 2022-06-27 05:54:59.083543582 +0000 +--- FFmpeg/doc/doxy/.gitignore 2022-06-29 07:15:48.295919033 +0000 +++ FFmpeg_patched/doc/doxy/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/html/ diff -Nur FFmpeg/doc/examples/.gitignore FFmpeg_patched/doc/examples/.gitignore ---- FFmpeg/doc/examples/.gitignore 2022-06-27 05:54:59.079543582 +0000 +--- FFmpeg/doc/examples/.gitignore 2022-06-29 07:15:48.299919033 +0000 +++ FFmpeg_patched/doc/examples/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -/avio_list_dir @@ -6634,8 +6656,8 @@ diff -Nur FFmpeg/doc/examples/.gitignore FFmpeg_patched/doc/examples/.gitignore -/vaapi_encode -/vaapi_transcode diff -Nur FFmpeg/doc/filters.texi FFmpeg_patched/doc/filters.texi ---- FFmpeg/doc/filters.texi 2022-06-27 05:54:59.083543582 +0000 -+++ FFmpeg_patched/doc/filters.texi 2022-06-27 05:52:13.411545552 +0000 +--- FFmpeg/doc/filters.texi 2022-06-29 07:15:48.307919033 +0000 ++++ FFmpeg_patched/doc/filters.texi 2022-06-29 07:16:09.535918781 +0000 @@ -25732,3 +25732,79 @@ @end table @@ -6718,7 +6740,7 @@ diff -Nur FFmpeg/doc/filters.texi FFmpeg_patched/doc/filters.texi + diff -Nur FFmpeg/enabling_mdf_cubification_SG1.sh FFmpeg_patched/enabling_mdf_cubification_SG1.sh --- FFmpeg/enabling_mdf_cubification_SG1.sh 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/enabling_mdf_cubification_SG1.sh 2022-06-27 05:52:13.591545550 +0000 ++++ FFmpeg_patched/enabling_mdf_cubification_SG1.sh 2022-06-29 07:16:09.727918778 +0000 @@ -0,0 +1,35 @@ +#!/bin/bash + @@ -6756,7 +6778,7 @@ diff -Nur FFmpeg/enabling_mdf_cubification_SG1.sh FFmpeg_patched/enabling_mdf_cu +cp ../run_cubification.sh ./ +./run_cubification.sh diff -Nur FFmpeg/ffbuild/.gitignore FFmpeg_patched/ffbuild/.gitignore ---- FFmpeg/ffbuild/.gitignore 2022-06-27 05:54:59.235543581 +0000 +--- FFmpeg/ffbuild/.gitignore 2022-06-29 07:15:48.311919033 +0000 +++ FFmpeg_patched/ffbuild/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -/.config @@ -6765,8 +6787,8 @@ diff -Nur FFmpeg/ffbuild/.gitignore FFmpeg_patched/ffbuild/.gitignore -/config.mak -/config.sh diff -Nur FFmpeg/fftools/ffmpeg.c FFmpeg_patched/fftools/ffmpeg.c ---- FFmpeg/fftools/ffmpeg.c 2022-06-27 05:54:59.083543582 +0000 -+++ FFmpeg_patched/fftools/ffmpeg.c 2022-06-27 05:52:13.411545552 +0000 +--- FFmpeg/fftools/ffmpeg.c 2022-06-29 07:15:48.311919033 +0000 ++++ FFmpeg_patched/fftools/ffmpeg.c 2022-06-29 07:16:09.535918781 +0000 @@ -1314,6 +1314,7 @@ if (ost->logfile && enc->stats_out) { fprintf(ost->logfile, "%s", enc->stats_out); @@ -6784,8 +6806,8 @@ diff -Nur FFmpeg/fftools/ffmpeg.c FFmpeg_patched/fftools/ffmpeg.c } diff -Nur FFmpeg/fftools/ffplay.c FFmpeg_patched/fftools/ffplay.c ---- FFmpeg/fftools/ffplay.c 2022-06-27 05:54:59.083543582 +0000 -+++ FFmpeg_patched/fftools/ffplay.c 2022-06-27 05:52:13.411545552 +0000 +--- FFmpeg/fftools/ffplay.c 2022-06-29 07:15:48.315919033 +0000 ++++ FFmpeg_patched/fftools/ffplay.c 2022-06-29 07:16:09.535918781 +0000 @@ -3355,15 +3355,22 @@ seek_chapter(cur_stream, -1); break; @@ -6824,7 +6846,7 @@ diff -Nur FFmpeg/fftools/ffplay.c FFmpeg_patched/fftools/ffplay.c break; } diff -Nur FFmpeg/libavcodec/.gitignore FFmpeg_patched/libavcodec/.gitignore ---- FFmpeg/libavcodec/.gitignore 2022-06-27 05:54:59.039543583 +0000 +--- FFmpeg/libavcodec/.gitignore 2022-06-29 07:15:48.315919033 +0000 +++ FFmpeg_patched/libavcodec/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -/*_tablegen @@ -6834,8 +6856,8 @@ diff -Nur FFmpeg/libavcodec/.gitignore FFmpeg_patched/libavcodec/.gitignore -/codec_list.c -/parser_list.c diff -Nur FFmpeg/libavcodec/Makefile FFmpeg_patched/libavcodec/Makefile ---- FFmpeg/libavcodec/Makefile 2022-06-27 05:54:58.963543584 +0000 -+++ FFmpeg_patched/libavcodec/Makefile 2022-06-27 05:52:13.291545553 +0000 +--- FFmpeg/libavcodec/Makefile 2022-06-29 07:15:48.315919033 +0000 ++++ FFmpeg_patched/libavcodec/Makefile 2022-06-29 07:16:09.415918782 +0000 @@ -96,6 +96,7 @@ OBJS-$(CONFIG_H264PRED) += h264pred.o OBJS-$(CONFIG_H264QPEL) += h264qpel.o @@ -6865,8 +6887,8 @@ diff -Nur FFmpeg/libavcodec/Makefile FFmpeg_patched/libavcodec/Makefile OBJS-$(CONFIG_RAWVIDEO_ENCODER) += rawenc.o OBJS-$(CONFIG_REALTEXT_DECODER) += realtextdec.o ass.o diff -Nur FFmpeg/libavcodec/allcodecs.c FFmpeg_patched/libavcodec/allcodecs.c ---- FFmpeg/libavcodec/allcodecs.c 2022-06-27 05:54:59.047543583 +0000 -+++ FFmpeg_patched/libavcodec/allcodecs.c 2022-06-27 05:52:13.395545552 +0000 +--- FFmpeg/libavcodec/allcodecs.c 2022-06-29 07:15:48.335919033 +0000 ++++ FFmpeg_patched/libavcodec/allcodecs.c 2022-06-29 07:16:09.519918781 +0000 @@ -146,7 +146,10 @@ extern AVCodec ff_h264_rkmpp_decoder; extern AVCodec ff_hap_encoder; @@ -6890,7 +6912,7 @@ diff -Nur FFmpeg/libavcodec/allcodecs.c FFmpeg_patched/libavcodec/allcodecs.c extern AVCodec ff_hevc_videotoolbox_encoder; diff -Nur FFmpeg/libavcodec/bypass_decoder.h FFmpeg_patched/libavcodec/bypass_decoder.h --- FFmpeg/libavcodec/bypass_decoder.h 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavcodec/bypass_decoder.h 2022-06-27 05:52:13.275545553 +0000 ++++ FFmpeg_patched/libavcodec/bypass_decoder.h 2022-06-29 07:16:09.395918782 +0000 @@ -0,0 +1,63 @@ +/* + * Raw Video Decoder @@ -6957,7 +6979,7 @@ diff -Nur FFmpeg/libavcodec/bypass_decoder.h FFmpeg_patched/libavcodec/bypass_de + diff -Nur FFmpeg/libavcodec/bypass_h264_decoder.c FFmpeg_patched/libavcodec/bypass_h264_decoder.c --- FFmpeg/libavcodec/bypass_h264_decoder.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavcodec/bypass_h264_decoder.c 2022-06-27 05:52:13.291545553 +0000 ++++ FFmpeg_patched/libavcodec/bypass_h264_decoder.c 2022-06-29 07:16:09.415918782 +0000 @@ -0,0 +1,150 @@ +/* + * Raw Video Decoder @@ -7111,7 +7133,7 @@ diff -Nur FFmpeg/libavcodec/bypass_h264_decoder.c FFmpeg_patched/libavcodec/bypa +}; diff -Nur FFmpeg/libavcodec/bypass_hevc_decoder.c FFmpeg_patched/libavcodec/bypass_hevc_decoder.c --- FFmpeg/libavcodec/bypass_hevc_decoder.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavcodec/bypass_hevc_decoder.c 2022-06-27 05:52:13.399545552 +0000 ++++ FFmpeg_patched/libavcodec/bypass_hevc_decoder.c 2022-06-29 07:16:09.523918781 +0000 @@ -0,0 +1,150 @@ +/* + * Raw Video Decoder @@ -7264,8 +7286,8 @@ diff -Nur FFmpeg/libavcodec/bypass_hevc_decoder.c FFmpeg_patched/libavcodec/bypa + .capabilities = AV_CODEC_CAP_PARAM_CHANGE, +}; diff -Nur FFmpeg/libavcodec/codec_desc.c FFmpeg_patched/libavcodec/codec_desc.c ---- FFmpeg/libavcodec/codec_desc.c 2022-06-27 05:54:59.015543583 +0000 -+++ FFmpeg_patched/libavcodec/codec_desc.c 2022-06-27 05:52:13.343545553 +0000 +--- FFmpeg/libavcodec/codec_desc.c 2022-06-29 07:15:48.367919032 +0000 ++++ FFmpeg_patched/libavcodec/codec_desc.c 2022-06-29 07:16:09.483918781 +0000 @@ -130,6 +130,20 @@ .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, @@ -7288,8 +7310,8 @@ diff -Nur FFmpeg/libavcodec/codec_desc.c FFmpeg_patched/libavcodec/codec_desc.c .type = AVMEDIA_TYPE_VIDEO, .name = "msmpeg4v1", diff -Nur FFmpeg/libavcodec/codec_id.h FFmpeg_patched/libavcodec/codec_id.h ---- FFmpeg/libavcodec/codec_id.h 2022-06-27 05:54:58.975543584 +0000 -+++ FFmpeg_patched/libavcodec/codec_id.h 2022-06-27 05:52:13.303545553 +0000 +--- FFmpeg/libavcodec/codec_id.h 2022-06-29 07:15:48.367919032 +0000 ++++ FFmpeg_patched/libavcodec/codec_id.h 2022-06-29 07:16:09.427918782 +0000 @@ -60,6 +60,8 @@ AV_CODEC_ID_JPEGLS, AV_CODEC_ID_MPEG4, @@ -7301,7 +7323,7 @@ diff -Nur FFmpeg/libavcodec/codec_id.h FFmpeg_patched/libavcodec/codec_id.h AV_CODEC_ID_MSMPEG4V3, diff -Nur FFmpeg/libavcodec/distributed_encoder.c FFmpeg_patched/libavcodec/distributed_encoder.c --- FFmpeg/libavcodec/distributed_encoder.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavcodec/distributed_encoder.c 2022-06-27 05:52:13.323545553 +0000 ++++ FFmpeg_patched/libavcodec/distributed_encoder.c 2022-06-29 07:16:09.447918782 +0000 @@ -0,0 +1,852 @@ +/* +* Scalable Video Technology for distributed encoder library plugin @@ -8156,8 +8178,8 @@ diff -Nur FFmpeg/libavcodec/distributed_encoder.c FFmpeg_patched/libavcodec/dist + .wrapper_name = "distributed_encoder", +}; diff -Nur FFmpeg/libavcodec/encode.c FFmpeg_patched/libavcodec/encode.c ---- FFmpeg/libavcodec/encode.c 2022-06-27 05:54:58.963543584 +0000 -+++ FFmpeg_patched/libavcodec/encode.c 2022-06-27 05:52:13.291545553 +0000 +--- FFmpeg/libavcodec/encode.c 2022-06-29 07:15:48.387919032 +0000 ++++ FFmpeg_patched/libavcodec/encode.c 2022-06-29 07:16:09.415918782 +0000 @@ -430,12 +430,13 @@ int ret; if (avctx->internal->draining && !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) @@ -8179,11 +8201,11 @@ diff -Nur FFmpeg/libavcodec/encode.c FFmpeg_patched/libavcodec/encode.c // Emulation via old API. diff -Nur FFmpeg/libavcodec/h264_parser.c FFmpeg_patched/libavcodec/h264_parser.c ---- FFmpeg/libavcodec/h264_parser.c 2022-06-27 05:54:59.039543583 +0000 -+++ FFmpeg_patched/libavcodec/h264_parser.c 2022-06-27 05:52:13.387545552 +0000 +--- FFmpeg/libavcodec/h264_parser.c 2022-06-29 07:15:48.403919032 +0000 ++++ FFmpeg_patched/libavcodec/h264_parser.c 2022-06-29 07:16:09.511918781 +0000 @@ -703,7 +703,7 @@ } - + AVCodecParser ff_h264_parser = { - .codec_ids = { AV_CODEC_ID_H264 }, + .codec_ids = { AV_CODEC_ID_H264, AV_CODEC_ID_H264BYPASSVIDEO }, @@ -8191,8 +8213,8 @@ diff -Nur FFmpeg/libavcodec/h264_parser.c FFmpeg_patched/libavcodec/h264_parser. .parser_init = init, .parser_parse = h264_parse, diff -Nur FFmpeg/libavcodec/hevc_parser.c FFmpeg_patched/libavcodec/hevc_parser.c ---- FFmpeg/libavcodec/hevc_parser.c 2022-06-27 05:54:59.015543583 +0000 -+++ FFmpeg_patched/libavcodec/hevc_parser.c 2022-06-27 05:52:13.343545553 +0000 +--- FFmpeg/libavcodec/hevc_parser.c 2022-06-29 07:15:48.407919032 +0000 ++++ FFmpeg_patched/libavcodec/hevc_parser.c 2022-06-29 07:16:09.483918781 +0000 @@ -381,7 +381,7 @@ } @@ -8204,7 +8226,7 @@ diff -Nur FFmpeg/libavcodec/hevc_parser.c FFmpeg_patched/libavcodec/hevc_parser. .parser_close = hevc_parser_close, diff -Nur FFmpeg/libavcodec/libopenhevc.c FFmpeg_patched/libavcodec/libopenhevc.c --- FFmpeg/libavcodec/libopenhevc.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavcodec/libopenhevc.c 2022-06-27 05:52:13.391545552 +0000 ++++ FFmpeg_patched/libavcodec/libopenhevc.c 2022-06-29 07:16:09.515918781 +0000 @@ -0,0 +1,188 @@ +/* + * OpenHEVC video Decoder @@ -8396,7 +8418,7 @@ diff -Nur FFmpeg/libavcodec/libopenhevc.c FFmpeg_patched/libavcodec/libopenhevc. +}; diff -Nur FFmpeg/libavcodec/libsvt_hevc.c FFmpeg_patched/libavcodec/libsvt_hevc.c --- FFmpeg/libavcodec/libsvt_hevc.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavcodec/libsvt_hevc.c 2022-06-27 05:52:13.387545552 +0000 ++++ FFmpeg_patched/libavcodec/libsvt_hevc.c 2022-06-29 07:16:09.511918781 +0000 @@ -0,0 +1,341 @@ +/* +* Scalable Video Technology for HEVC encoder library plugin @@ -8740,7 +8762,7 @@ diff -Nur FFmpeg/libavcodec/libsvt_hevc.c FFmpeg_patched/libavcodec/libsvt_hevc. +}; + diff -Nur FFmpeg/libavcodec/tests/.gitignore FFmpeg_patched/libavcodec/tests/.gitignore ---- FFmpeg/libavcodec/tests/.gitignore 2022-06-27 05:54:58.995543583 +0000 +--- FFmpeg/libavcodec/tests/.gitignore 2022-06-29 07:15:48.519919030 +0000 +++ FFmpeg_patched/libavcodec/tests/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -/avfft @@ -8769,7 +8791,7 @@ diff -Nur FFmpeg/libavcodec/tests/.gitignore FFmpeg_patched/libavcodec/tests/.gi -/utils diff -Nur FFmpeg/libavcodec/tile_encode_svt_impl.c FFmpeg_patched/libavcodec/tile_encode_svt_impl.c --- FFmpeg/libavcodec/tile_encode_svt_impl.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavcodec/tile_encode_svt_impl.c 2022-06-27 05:52:13.391545552 +0000 ++++ FFmpeg_patched/libavcodec/tile_encode_svt_impl.c 2022-06-29 07:16:09.515918781 +0000 @@ -0,0 +1,488 @@ +/* + * Intel tile encoder @@ -9261,7 +9283,7 @@ diff -Nur FFmpeg/libavcodec/tile_encode_svt_impl.c FFmpeg_patched/libavcodec/til +} diff -Nur FFmpeg/libavcodec/tile_encode_x265_impl.c FFmpeg_patched/libavcodec/tile_encode_x265_impl.c --- FFmpeg/libavcodec/tile_encode_x265_impl.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavcodec/tile_encode_x265_impl.c 2022-06-27 05:52:13.335545553 +0000 ++++ FFmpeg_patched/libavcodec/tile_encode_x265_impl.c 2022-06-29 07:16:09.475918781 +0000 @@ -0,0 +1,477 @@ +/* + * Intel tile encoder @@ -9743,7 +9765,7 @@ diff -Nur FFmpeg/libavcodec/tile_encode_x265_impl.c FFmpeg_patched/libavcodec/ti \ No newline at end of file diff -Nur FFmpeg/libavcodec/tile_encoder.c FFmpeg_patched/libavcodec/tile_encoder.c --- FFmpeg/libavcodec/tile_encoder.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavcodec/tile_encoder.c 2022-06-27 05:52:13.275545553 +0000 ++++ FFmpeg_patched/libavcodec/tile_encoder.c 2022-06-29 07:16:09.395918782 +0000 @@ -0,0 +1,586 @@ +/* + * Intel tile encoder @@ -10333,7 +10355,7 @@ diff -Nur FFmpeg/libavcodec/tile_encoder.c FFmpeg_patched/libavcodec/tile_encode +}; diff -Nur FFmpeg/libavcodec/tile_encoder.h FFmpeg_patched/libavcodec/tile_encoder.h --- FFmpeg/libavcodec/tile_encoder.h 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavcodec/tile_encoder.h 2022-06-27 05:52:13.387545552 +0000 ++++ FFmpeg_patched/libavcodec/tile_encoder.h 2022-06-29 07:16:09.511918781 +0000 @@ -0,0 +1,125 @@ +/* + * Intel tile encoder @@ -10461,24 +10483,24 @@ diff -Nur FFmpeg/libavcodec/tile_encoder.h FFmpeg_patched/libavcodec/tile_encode +#endif /* TILE_ENCODER_H */ + diff -Nur FFmpeg/libavdevice/.gitignore FFmpeg_patched/libavdevice/.gitignore ---- FFmpeg/libavdevice/.gitignore 2022-06-27 05:54:59.075543583 +0000 +--- FFmpeg/libavdevice/.gitignore 2022-06-29 07:15:48.579919030 +0000 +++ FFmpeg_patched/libavdevice/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -/indev_list.c -/outdev_list.c diff -Nur FFmpeg/libavdevice/tests/.gitignore FFmpeg_patched/libavdevice/tests/.gitignore ---- FFmpeg/libavdevice/tests/.gitignore 2022-06-27 05:54:59.075543583 +0000 +--- FFmpeg/libavdevice/tests/.gitignore 2022-06-29 07:15:48.583919030 +0000 +++ FFmpeg_patched/libavdevice/tests/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/timefilter diff -Nur FFmpeg/libavfilter/.gitignore FFmpeg_patched/libavfilter/.gitignore ---- FFmpeg/libavfilter/.gitignore 2022-06-27 05:54:59.259543580 +0000 +--- FFmpeg/libavfilter/.gitignore 2022-06-29 07:15:48.587919030 +0000 +++ FFmpeg_patched/libavfilter/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/filter_list.c diff -Nur FFmpeg/libavfilter/Makefile FFmpeg_patched/libavfilter/Makefile ---- FFmpeg/libavfilter/Makefile 2022-06-27 05:54:59.239543581 +0000 -+++ FFmpeg_patched/libavfilter/Makefile 2022-06-27 05:52:13.595545550 +0000 +--- FFmpeg/libavfilter/Makefile 2022-06-29 07:15:48.587919030 +0000 ++++ FFmpeg_patched/libavfilter/Makefile 2022-06-29 07:16:09.735918778 +0000 @@ -143,6 +143,7 @@ OBJS-$(CONFIG_VIBRATO_FILTER) += af_vibrato.o generate_wave_table.o OBJS-$(CONFIG_VOLUME_FILTER) += af_volume.o @@ -10504,8 +10526,8 @@ diff -Nur FFmpeg/libavfilter/Makefile FFmpeg_patched/libavfilter/Makefile OBJS-$(CONFIG_TPAD_FILTER) += vf_tpad.o OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o diff -Nur FFmpeg/libavfilter/allfilters.c FFmpeg_patched/libavfilter/allfilters.c ---- FFmpeg/libavfilter/allfilters.c 2022-06-27 05:54:59.247543580 +0000 -+++ FFmpeg_patched/libavfilter/allfilters.c 2022-06-27 05:52:13.607545549 +0000 +--- FFmpeg/libavfilter/allfilters.c 2022-06-29 07:15:48.595919030 +0000 ++++ FFmpeg_patched/libavfilter/allfilters.c 2022-06-29 07:16:09.751918778 +0000 @@ -229,6 +229,7 @@ extern AVFilter ff_vf_erosion; extern AVFilter ff_vf_erosion_opencl; @@ -10531,12 +10553,12 @@ diff -Nur FFmpeg/libavfilter/allfilters.c FFmpeg_patched/libavfilter/allfilters. extern AVFilter ff_vsrc_allrgb; extern AVFilter ff_vsrc_allyuv; diff -Nur FFmpeg/libavfilter/opencl/.gitignore FFmpeg_patched/libavfilter/opencl/.gitignore ---- FFmpeg/libavfilter/opencl/.gitignore 2022-06-27 05:54:59.255543580 +0000 +--- FFmpeg/libavfilter/opencl/.gitignore 2022-06-29 07:15:48.607919029 +0000 +++ FFmpeg_patched/libavfilter/opencl/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -*.c diff -Nur FFmpeg/libavfilter/tests/.gitignore FFmpeg_patched/libavfilter/tests/.gitignore ---- FFmpeg/libavfilter/tests/.gitignore 2022-06-27 05:54:59.247543580 +0000 +--- FFmpeg/libavfilter/tests/.gitignore 2022-06-29 07:15:48.611919029 +0000 +++ FFmpeg_patched/libavfilter/tests/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -/drawutils @@ -10545,7 +10567,7 @@ diff -Nur FFmpeg/libavfilter/tests/.gitignore FFmpeg_patched/libavfilter/tests/. -/integral diff -Nur FFmpeg/libavfilter/vf_erp2cubmap_mdf.c FFmpeg_patched/libavfilter/vf_erp2cubmap_mdf.c --- FFmpeg/libavfilter/vf_erp2cubmap_mdf.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavfilter/vf_erp2cubmap_mdf.c 2022-06-27 05:52:13.603545549 +0000 ++++ FFmpeg_patched/libavfilter/vf_erp2cubmap_mdf.c 2022-06-29 07:16:09.747918778 +0000 @@ -0,0 +1,275 @@ +#include + @@ -10824,7 +10846,7 @@ diff -Nur FFmpeg/libavfilter/vf_erp2cubmap_mdf.c FFmpeg_patched/libavfilter/vf_e + diff -Nur FFmpeg/libavfilter/vf_transform360.c FFmpeg_patched/libavfilter/vf_transform360.c --- FFmpeg/libavfilter/vf_transform360.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavfilter/vf_transform360.c 2022-06-27 05:52:13.603545549 +0000 ++++ FFmpeg_patched/libavfilter/vf_transform360.c 2022-06-29 07:16:09.747918778 +0000 @@ -0,0 +1,483 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. @@ -11311,7 +11333,7 @@ diff -Nur FFmpeg/libavfilter/vf_transform360.c FFmpeg_patched/libavfilter/vf_tra +}; diff -Nur FFmpeg/libavfilter/vf_xcam.c FFmpeg_patched/libavfilter/vf_xcam.c --- FFmpeg/libavfilter/vf_xcam.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavfilter/vf_xcam.c 2022-06-27 05:52:13.611545549 +0000 ++++ FFmpeg_patched/libavfilter/vf_xcam.c 2022-06-29 07:16:09.759918778 +0000 @@ -0,0 +1,350 @@ +/* + * Copyright (c) 2020 Intel Corporation, all rights reserved. @@ -11664,15 +11686,15 @@ diff -Nur FFmpeg/libavfilter/vf_xcam.c FFmpeg_patched/libavfilter/vf_xcam.c +}; + diff -Nur FFmpeg/libavformat/.gitignore FFmpeg_patched/libavformat/.gitignore ---- FFmpeg/libavformat/.gitignore 2022-06-27 05:54:59.107543582 +0000 +--- FFmpeg/libavformat/.gitignore 2022-06-29 07:15:48.651919029 +0000 +++ FFmpeg_patched/libavformat/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -/protocol_list.c -/muxer_list.c -/demuxer_list.c diff -Nur FFmpeg/libavformat/Makefile FFmpeg_patched/libavformat/Makefile ---- FFmpeg/libavformat/Makefile 2022-06-27 05:54:59.087543582 +0000 -+++ FFmpeg_patched/libavformat/Makefile 2022-06-27 05:52:13.419545552 +0000 +--- FFmpeg/libavformat/Makefile 2022-06-29 07:15:48.651919029 +0000 ++++ FFmpeg_patched/libavformat/Makefile 2022-06-29 07:16:09.543918781 +0000 @@ -148,6 +148,8 @@ OBJS-$(CONFIG_DATA_MUXER) += rawenc.o OBJS-$(CONFIG_DASH_MUXER) += dash.o dashenc.o hlsplaylist.o @@ -11683,8 +11705,8 @@ diff -Nur FFmpeg/libavformat/Makefile FFmpeg_patched/libavformat/Makefile OBJS-$(CONFIG_DAUD_MUXER) += daudenc.o OBJS-$(CONFIG_DCSTR_DEMUXER) += dcstr.o diff -Nur FFmpeg/libavformat/allformats.c FFmpeg_patched/libavformat/allformats.c ---- FFmpeg/libavformat/allformats.c 2022-06-27 05:54:59.087543582 +0000 -+++ FFmpeg_patched/libavformat/allformats.c 2022-06-27 05:52:13.415545552 +0000 +--- FFmpeg/libavformat/allformats.c 2022-06-29 07:15:48.651919029 +0000 ++++ FFmpeg_patched/libavformat/allformats.c 2022-06-29 07:16:09.539918781 +0000 @@ -187,6 +187,8 @@ extern AVOutputFormat ff_hds_muxer; extern AVInputFormat ff_hevc_demuxer; @@ -11695,8 +11717,8 @@ diff -Nur FFmpeg/libavformat/allformats.c FFmpeg_patched/libavformat/allformats. extern AVOutputFormat ff_hls_muxer; extern AVInputFormat ff_hnm_demuxer; diff -Nur FFmpeg/libavformat/flv.h FFmpeg_patched/libavformat/flv.h ---- FFmpeg/libavformat/flv.h 2022-06-27 05:54:59.107543582 +0000 -+++ FFmpeg_patched/libavformat/flv.h 2022-06-27 05:52:13.439545551 +0000 +--- FFmpeg/libavformat/flv.h 2022-06-29 07:15:48.667919029 +0000 ++++ FFmpeg_patched/libavformat/flv.h 2022-06-29 07:16:09.579918780 +0000 @@ -110,6 +110,7 @@ FLV_CODECID_H264 = 7, FLV_CODECID_REALH263= 8, @@ -11706,8 +11728,8 @@ diff -Nur FFmpeg/libavformat/flv.h FFmpeg_patched/libavformat/flv.h enum { diff -Nur FFmpeg/libavformat/flvdec.c FFmpeg_patched/libavformat/flvdec.c ---- FFmpeg/libavformat/flvdec.c 2022-06-27 05:54:59.095543582 +0000 -+++ FFmpeg_patched/libavformat/flvdec.c 2022-06-27 05:52:13.427545552 +0000 +--- FFmpeg/libavformat/flvdec.c 2022-06-29 07:15:48.667919029 +0000 ++++ FFmpeg_patched/libavformat/flvdec.c 2022-06-29 07:16:09.559918780 +0000 @@ -36,6 +36,7 @@ #include "internal.h" #include "avio_internal.h" @@ -11766,8 +11788,8 @@ diff -Nur FFmpeg/libavformat/flvdec.c FFmpeg_patched/libavformat/flvdec.c if (st->codecpar->extradata) { diff -Nur FFmpeg/libavformat/flvenc.c FFmpeg_patched/libavformat/flvenc.c ---- FFmpeg/libavformat/flvenc.c 2022-06-27 05:54:59.103543582 +0000 -+++ FFmpeg_patched/libavformat/flvenc.c 2022-06-27 05:52:13.435545551 +0000 +--- FFmpeg/libavformat/flvenc.c 2022-06-29 07:15:48.667919029 +0000 ++++ FFmpeg_patched/libavformat/flvenc.c 2022-06-29 07:16:09.571918780 +0000 @@ -29,6 +29,7 @@ #include "avc.h" #include "avformat.h" @@ -11881,7 +11903,7 @@ diff -Nur FFmpeg/libavformat/flvenc.c FFmpeg_patched/libavformat/flvenc.c } diff -Nur FFmpeg/libavformat/omaf_packing_enc.c FFmpeg_patched/libavformat/omaf_packing_enc.c --- FFmpeg/libavformat/omaf_packing_enc.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavformat/omaf_packing_enc.c 2022-06-27 05:52:13.439545551 +0000 ++++ FFmpeg_patched/libavformat/omaf_packing_enc.c 2022-06-29 07:16:09.579918780 +0000 @@ -0,0 +1,810 @@ +/* + * Intel tile Dash muxer @@ -12694,7 +12716,7 @@ diff -Nur FFmpeg/libavformat/omaf_packing_enc.c FFmpeg_patched/libavformat/omaf_ + + diff -Nur FFmpeg/libavformat/tests/.gitignore FFmpeg_patched/libavformat/tests/.gitignore ---- FFmpeg/libavformat/tests/.gitignore 2022-06-27 05:54:59.099543582 +0000 +--- FFmpeg/libavformat/tests/.gitignore 2022-06-29 07:15:48.707919028 +0000 +++ FFmpeg_patched/libavformat/tests/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -/fifo_muxer @@ -12706,7 +12728,7 @@ diff -Nur FFmpeg/libavformat/tests/.gitignore FFmpeg_patched/libavformat/tests/. -/url diff -Nur FFmpeg/libavformat/tiled_dash_dec.c FFmpeg_patched/libavformat/tiled_dash_dec.c --- FFmpeg/libavformat/tiled_dash_dec.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavformat/tiled_dash_dec.c 2022-06-27 05:52:13.443545551 +0000 ++++ FFmpeg_patched/libavformat/tiled_dash_dec.c 2022-06-29 07:16:09.583918780 +0000 @@ -0,0 +1,408 @@ +/* + * Intel tile Dash Demuxer @@ -13118,7 +13140,7 @@ diff -Nur FFmpeg/libavformat/tiled_dash_dec.c FFmpeg_patched/libavformat/tiled_d +}; diff -Nur FFmpeg/libavformat/tiled_dash_dec.h FFmpeg_patched/libavformat/tiled_dash_dec.h --- FFmpeg/libavformat/tiled_dash_dec.h 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavformat/tiled_dash_dec.h 2022-06-27 05:52:13.423545552 +0000 ++++ FFmpeg_patched/libavformat/tiled_dash_dec.h 2022-06-29 07:16:09.551918780 +0000 @@ -0,0 +1,65 @@ +/* + * Intel tile Dash muxer @@ -13187,7 +13209,7 @@ diff -Nur FFmpeg/libavformat/tiled_dash_dec.h FFmpeg_patched/libavformat/tiled_d + diff -Nur FFmpeg/libavformat/tiled_dash_enc.c FFmpeg_patched/libavformat/tiled_dash_enc.c --- FFmpeg/libavformat/tiled_dash_enc.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavformat/tiled_dash_enc.c 2022-06-27 05:52:13.435545551 +0000 ++++ FFmpeg_patched/libavformat/tiled_dash_enc.c 2022-06-29 07:16:09.571918780 +0000 @@ -0,0 +1,359 @@ +/* + * Intel tile Dash muxer @@ -13550,7 +13572,7 @@ diff -Nur FFmpeg/libavformat/tiled_dash_enc.c FFmpeg_patched/libavformat/tiled_d + diff -Nur FFmpeg/libavformat/tiled_dash_parse.c FFmpeg_patched/libavformat/tiled_dash_parse.c --- FFmpeg/libavformat/tiled_dash_parse.c 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavformat/tiled_dash_parse.c 2022-06-27 05:52:13.415545552 +0000 ++++ FFmpeg_patched/libavformat/tiled_dash_parse.c 2022-06-29 07:16:09.539918781 +0000 @@ -0,0 +1,1624 @@ +/* + * Intel tile Dash muxer @@ -15178,7 +15200,7 @@ diff -Nur FFmpeg/libavformat/tiled_dash_parse.c FFmpeg_patched/libavformat/tiled +} diff -Nur FFmpeg/libavformat/tiled_dash_parse.h FFmpeg_patched/libavformat/tiled_dash_parse.h --- FFmpeg/libavformat/tiled_dash_parse.h 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/libavformat/tiled_dash_parse.h 2022-06-27 05:52:13.423545552 +0000 ++++ FFmpeg_patched/libavformat/tiled_dash_parse.h 2022-06-29 07:16:09.555918780 +0000 @@ -0,0 +1,168 @@ +/* + * Intel tile Dash muxer @@ -15349,18 +15371,18 @@ diff -Nur FFmpeg/libavformat/tiled_dash_parse.h FFmpeg_patched/libavformat/tiled +#endif + diff -Nur FFmpeg/libavresample/tests/.gitignore FFmpeg_patched/libavresample/tests/.gitignore ---- FFmpeg/libavresample/tests/.gitignore 2022-06-27 05:54:59.267543580 +0000 +--- FFmpeg/libavresample/tests/.gitignore 2022-06-29 07:15:48.715919028 +0000 +++ FFmpeg_patched/libavresample/tests/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/avresample diff -Nur FFmpeg/libavutil/.gitignore FFmpeg_patched/libavutil/.gitignore ---- FFmpeg/libavutil/.gitignore 2022-06-27 05:54:58.943543584 +0000 +--- FFmpeg/libavutil/.gitignore 2022-06-29 07:15:48.719919028 +0000 +++ FFmpeg_patched/libavutil/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -/avconfig.h -/ffversion.h diff -Nur FFmpeg/libavutil/tests/.gitignore FFmpeg_patched/libavutil/tests/.gitignore ---- FFmpeg/libavutil/tests/.gitignore 2022-06-27 05:54:58.935543584 +0000 +--- FFmpeg/libavutil/tests/.gitignore 2022-06-29 07:15:48.739919028 +0000 +++ FFmpeg_patched/libavutil/tests/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -/adler32 @@ -15415,12 +15437,12 @@ diff -Nur FFmpeg/libavutil/tests/.gitignore FFmpeg_patched/libavutil/tests/.giti -/utf8 -/xtea diff -Nur FFmpeg/libswresample/tests/.gitignore FFmpeg_patched/libswresample/tests/.gitignore ---- FFmpeg/libswresample/tests/.gitignore 2022-06-27 05:54:59.083543582 +0000 +--- FFmpeg/libswresample/tests/.gitignore 2022-06-29 07:15:48.747919028 +0000 +++ FFmpeg_patched/libswresample/tests/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/swresample diff -Nur FFmpeg/libswscale/tests/.gitignore FFmpeg_patched/libswscale/tests/.gitignore ---- FFmpeg/libswscale/tests/.gitignore 2022-06-27 05:54:59.231543581 +0000 +--- FFmpeg/libswscale/tests/.gitignore 2022-06-29 07:15:48.755919028 +0000 +++ FFmpeg_patched/libswscale/tests/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -/colorspace @@ -15428,7 +15450,7 @@ diff -Nur FFmpeg/libswscale/tests/.gitignore FFmpeg_patched/libswscale/tests/.gi -/swscale diff -Nur FFmpeg/run_cubification.sh FFmpeg_patched/run_cubification.sh --- FFmpeg/run_cubification.sh 1970-01-01 00:00:00.000000000 +0000 -+++ FFmpeg_patched/run_cubification.sh 2022-06-27 05:52:13.623545549 +0000 ++++ FFmpeg_patched/run_cubification.sh 2022-06-29 07:16:09.771918778 +0000 @@ -0,0 +1,15 @@ +#!/bin/bash + @@ -15446,7 +15468,7 @@ diff -Nur FFmpeg/run_cubification.sh FFmpeg_patched/run_cubification.sh +./ffmpeg -hwaccel vaapi -hwaccel_output_format vaapi -i h265_7680x3840.h265 -vf erp2cubmap_mdf,hwdownload,format=nv12 -pix_fmt yuv420p -input_type 1 -rc 1 -c:v distributed_encoder -s 5760x3840 -g 25 -tile_row 6 -tile_column 9 -la_depth 2 -config_file config_high.xml -b 30M -map 0:v -y cubification_8k.h265 + diff -Nur FFmpeg/tests/.gitignore FFmpeg_patched/tests/.gitignore ---- FFmpeg/tests/.gitignore 2022-06-27 05:54:59.231543581 +0000 +--- FFmpeg/tests/.gitignore 2022-06-29 07:15:48.755919028 +0000 +++ FFmpeg_patched/tests/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -/audiogen @@ -15461,17 +15483,17 @@ diff -Nur FFmpeg/tests/.gitignore FFmpeg_patched/tests/.gitignore -/videogen -/vsynth1/ diff -Nur FFmpeg/tests/api/.gitignore FFmpeg_patched/tests/api/.gitignore ---- FFmpeg/tests/api/.gitignore 2022-06-27 05:54:59.231543581 +0000 +--- FFmpeg/tests/api/.gitignore 2022-06-29 07:15:48.755919028 +0000 +++ FFmpeg_patched/tests/api/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/*-test diff -Nur FFmpeg/tests/checkasm/.gitignore FFmpeg_patched/tests/checkasm/.gitignore ---- FFmpeg/tests/checkasm/.gitignore 2022-06-27 05:54:59.115543582 +0000 +--- FFmpeg/tests/checkasm/.gitignore 2022-06-29 07:15:48.759919028 +0000 +++ FFmpeg_patched/tests/checkasm/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/checkasm diff -Nur FFmpeg/tests/dnn/.gitignore FFmpeg_patched/tests/dnn/.gitignore ---- FFmpeg/tests/dnn/.gitignore 2022-06-27 05:54:59.231543581 +0000 +--- FFmpeg/tests/dnn/.gitignore 2022-06-29 07:15:48.759919028 +0000 +++ FFmpeg_patched/tests/dnn/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -/dnn-layer-conv2d-test @@ -15481,7 +15503,7 @@ diff -Nur FFmpeg/tests/dnn/.gitignore FFmpeg_patched/tests/dnn/.gitignore -/dnn-layer-mathbinary-test -/dnn-layer-mathunary-test diff -Nur FFmpeg/tools/.gitignore FFmpeg_patched/tools/.gitignore ---- FFmpeg/tools/.gitignore 2022-06-27 05:54:59.115543582 +0000 +--- FFmpeg/tools/.gitignore 2022-06-29 07:15:48.907919026 +0000 +++ FFmpeg_patched/tools/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -/aviocat