From a350a71a095607d057c30152b9c54b7e15559cef Mon Sep 17 00:00:00 2001 From: lilei <15209495+lileiAJ@user.noreply.gitee.com> Date: Mon, 2 Dec 2024 20:11:40 +0800 Subject: [PATCH 1/8] =?UTF-8?q?lilei433@h-partners.com=E5=9C=A8=E6=9E=90?= =?UTF-8?q?=E6=9E=84=E5=87=BD=E6=95=B0=E4=B8=AD=E6=A3=80=E6=9F=A5=E4=BA=86?= =?UTF-8?q?stream=5Ftexture=5Fsii-=E6=8C=87=E9=92=88=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=86=8D=E8=B0=83=E7=94=A8=20Releas?= =?UTF-8?q?eResources()=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lilei --- .../service/ohos/native_image_image_backing.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gpu/command_buffer/service/ohos/native_image_image_backing.cc b/gpu/command_buffer/service/ohos/native_image_image_backing.cc index aa5da50eb3..e69033902a 100644 --- a/gpu/command_buffer/service/ohos/native_image_image_backing.cc +++ b/gpu/command_buffer/service/ohos/native_image_image_backing.cc @@ -56,7 +56,10 @@ NativeImageImageBacking::~NativeImageImageBacking() { context_state_->RemoveContextLostObserver(this); } context_state_.reset(); - stream_texture_sii_->ReleaseResources(); + if(stream_texture_sii_ != nullptr) { + stream_texture_sii_->ReleaseResources(); + stream_texture_sii_ = nullptr; + } stream_texture_sii_.reset(); } -- Gitee From 863bfedaf26df2a7c1cb3f91acab76863d046985 Mon Sep 17 00:00:00 2001 From: lilei Date: Mon, 9 Dec 2024 19:07:57 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=9C=A8=E6=9E=90=E6=9E=84=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E4=B8=AD=E6=A3=80=E6=9F=A5=E4=BA=86stream=5Ftexture?= =?UTF-8?q?=5Fsii-=E6=8C=87=E9=92=88=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=EF=BC=8C=E5=86=8D=E8=B0=83=E7=94=A8ReleaseResources()=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lilei --- chromium_src | 2 +- gpu/command_buffer/service/ohos/native_image_image_backing.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium_src b/chromium_src index 4ffe6a06ee..ac7d28de63 160000 --- a/chromium_src +++ b/chromium_src @@ -1 +1 @@ -Subproject commit 4ffe6a06eefa10179ffca2aa55423d12e41d2697 +Subproject commit ac7d28de634965a84aac3cca10a729db33ff1f16 diff --git a/gpu/command_buffer/service/ohos/native_image_image_backing.cc b/gpu/command_buffer/service/ohos/native_image_image_backing.cc index e69033902a..173a867ce0 100644 --- a/gpu/command_buffer/service/ohos/native_image_image_backing.cc +++ b/gpu/command_buffer/service/ohos/native_image_image_backing.cc @@ -56,11 +56,11 @@ NativeImageImageBacking::~NativeImageImageBacking() { context_state_->RemoveContextLostObserver(this); } context_state_.reset(); - if(stream_texture_sii_ != nullptr) { + if (stream_texture_sii_ != nullptr) { stream_texture_sii_->ReleaseResources(); stream_texture_sii_ = nullptr; + stream_texture_sii_.reset(); } - stream_texture_sii_.reset(); } size_t NativeImageImageBacking::GetEstimatedSizeForMemoryDump() const { -- Gitee From 7f0722c05e8c89c37f78856856b53f3adbb42be4 Mon Sep 17 00:00:00 2001 From: lilei Date: Thu, 12 Dec 2024 22:34:08 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E8=A7=86?= =?UTF-8?q?=E9=A2=91dump=E8=83=BD=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lilei --- .../ohos/ohos_media_decoder_bridge_impl.cc | 64 +++++++++++++++++++ .../ohos/ohos_media_decoder_bridge_impl.h | 9 +++ 2 files changed, 73 insertions(+) diff --git a/media/base/ohos/ohos_media_decoder_bridge_impl.cc b/media/base/ohos/ohos_media_decoder_bridge_impl.cc index 3cdd090a19..21f055dc3b 100644 --- a/media/base/ohos/ohos_media_decoder_bridge_impl.cc +++ b/media/base/ohos/ohos_media_decoder_bridge_impl.cc @@ -7,6 +7,7 @@ #include #include #include +#include #include "decoder_format_adapter_impl.h" #include "base/logging.h" @@ -18,6 +19,9 @@ using namespace media; using namespace OHOS::NWeb; using namespace std; +static char *DUMP_APP_DIR = "/data/storage/el2/base/"; +static char* DUMP_AUDIO_PARA = "web.debug.audiodump"; + const std::string PRODUCT_MODEL_EMULATOR = "emulator"; void clearInputQueue(std::queue& q) { @@ -121,11 +125,19 @@ MediaCodecDecoderBridgeImpl::MediaCodecDecoderBridgeImpl( return; } cb_->on_buffers_available_cb_ = on_buffers_available_cb; + + LOG(INFO) << "DumpFileUtil::OpenDumpFile."; + time_t now = time(nullptr); + std::string dumpFrontFileName = std::to_string(now) + "input_video.mp4"; + DumpFileUtil::OpenDumpFile(std::string dumpFrontFileName, &dumpFrontFile_); } MediaCodecDecoderBridgeImpl::~MediaCodecDecoderBridgeImpl() { LOG(INFO) << "MediaCodecDecoderBridgeImpl::~MediaCodecDecoderBridgeImpl."; ReleaseBridgeDecoder(); + + LOG(INFO) << "DumpFileUtil::CloseDumpFile."; + DumpFileUtil::CloseDumpFile(FILE **dumpFile); } DecoderAdapterCode MediaCodecDecoderBridgeImpl::ConfigureBridgeDecoder( @@ -396,6 +408,10 @@ DecoderAdapterCode MediaCodecDecoderBridgeImpl::QueueInputBuffer( DecoderAdapterCode ret = PushInbufferDec(index, inputSize, presentation_time); PopInqueueDec(); + + LOG(INFO) << "DumpFileUtil::WriteDumpFile Start"; + DumpFileUtil::WriteDumpFile(dumpFrontFile_, buffer.addr, bufferSize); + return ret; } @@ -580,3 +596,51 @@ void CodecBridgeCallback::OnNeedOutputData( signal_->outputQueue_.push(outputBuffer); on_buffers_available_cb_.Run(); } + +void DumpFileUtil::WriteDumpFile(FILE *dumpFile, void *buffer, size_t bufferSize) +{ + if (dumpFile == nullptr) { + return; + } + if (buffer == nullptr) { + LOG(WARNING) << "DumpFileUtil::WriteDumpFile buffer == nullptr"; + return; + } + size_t writeResult = fwrite(buffer, 1, bufferSize, dumpFile); + if (writeResult != bufferSize) { + LOG(WARNING) << "DumpFileUtil::WriteDumpFile writeResult != bufferSize"; + return; + } + return; +} + +void DumpFileUtil::CloseDumpFile(FILE **dumpFile) +{ + if (*dumpFile == nullptr) { + return; + } + int rc = fclose(*dumpFile); + if (rc != 0) { + LOG(WARNING) << "DumpFileUtil::CloseDumpFile err"; + } + *dumpFile = nullptr; + return; +} + +void DumpFileUtil::OpenDumpFile(std::string filename, FILE **file) +{ + std::string filePath = DUMP_APP_DIR + filename; + FILE *dumpFile = nullptr; + bool res = OHOS::NWeb::OhosAdapterHelper::GetInstance(). + GetSystemPropertiesInstance().GetBoolParameter(DUMP_AUDIO_PARA, false); + if (!res) { + return; + } + dumpFile = fopen(filePath.c_str(), "wb+"); + if (dumpFile == nullptr) { + LOG(WARNING) << "DumpFileUtil::OpenDumpFile fopen failed! filename: " << filename; + return; + } + *file = dumpFile; + return; +} diff --git a/media/base/ohos/ohos_media_decoder_bridge_impl.h b/media/base/ohos/ohos_media_decoder_bridge_impl.h index d9062b1945..0f27aaafd1 100644 --- a/media/base/ohos/ohos_media_decoder_bridge_impl.h +++ b/media/base/ohos/ohos_media_decoder_bridge_impl.h @@ -149,8 +149,17 @@ class MediaCodecDecoderBridgeImpl { scoped_refptr decoder_task_runner_ = nullptr; int32_t width_; int32_t height_; + FILE *dumpFrontFile_ = nullptr; }; +class DumpFileUtil { + public: + static void WriteDumpFile(FILE *dumpFile, void *buffer, size_t bufferSize); + static void CloseDumpFile(FILE **dumpFile); + static void OpenDumpFile(std::string filename, FILE **file); +}; + + } // namespace media #endif // MEDIA_BASE_OHOS_MEDIA_CODEC_BRIDGE_IMPL_H_ -- Gitee From f96aff39511411096dfe27448fd16db4a60bebe9 Mon Sep 17 00:00:00 2001 From: lilei Date: Fri, 13 Dec 2024 10:25:12 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E8=A7=86?= =?UTF-8?q?=E9=A2=91dump=E8=83=BD=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lilei --- .../ohos/ohos_media_decoder_bridge_impl.cc | 65 +------------------ .../ohos/ohos_media_decoder_bridge_impl.h | 9 --- 2 files changed, 1 insertion(+), 73 deletions(-) diff --git a/media/base/ohos/ohos_media_decoder_bridge_impl.cc b/media/base/ohos/ohos_media_decoder_bridge_impl.cc index 21f055dc3b..aa7bbfae5e 100644 --- a/media/base/ohos/ohos_media_decoder_bridge_impl.cc +++ b/media/base/ohos/ohos_media_decoder_bridge_impl.cc @@ -7,7 +7,6 @@ #include #include #include -#include #include "decoder_format_adapter_impl.h" #include "base/logging.h" @@ -19,8 +18,6 @@ using namespace media; using namespace OHOS::NWeb; using namespace std; -static char *DUMP_APP_DIR = "/data/storage/el2/base/"; -static char* DUMP_AUDIO_PARA = "web.debug.audiodump"; const std::string PRODUCT_MODEL_EMULATOR = "emulator"; @@ -125,19 +122,11 @@ MediaCodecDecoderBridgeImpl::MediaCodecDecoderBridgeImpl( return; } cb_->on_buffers_available_cb_ = on_buffers_available_cb; - - LOG(INFO) << "DumpFileUtil::OpenDumpFile."; - time_t now = time(nullptr); - std::string dumpFrontFileName = std::to_string(now) + "input_video.mp4"; - DumpFileUtil::OpenDumpFile(std::string dumpFrontFileName, &dumpFrontFile_); } MediaCodecDecoderBridgeImpl::~MediaCodecDecoderBridgeImpl() { LOG(INFO) << "MediaCodecDecoderBridgeImpl::~MediaCodecDecoderBridgeImpl."; ReleaseBridgeDecoder(); - - LOG(INFO) << "DumpFileUtil::CloseDumpFile."; - DumpFileUtil::CloseDumpFile(FILE **dumpFile); } DecoderAdapterCode MediaCodecDecoderBridgeImpl::ConfigureBridgeDecoder( @@ -408,10 +397,6 @@ DecoderAdapterCode MediaCodecDecoderBridgeImpl::QueueInputBuffer( DecoderAdapterCode ret = PushInbufferDec(index, inputSize, presentation_time); PopInqueueDec(); - - LOG(INFO) << "DumpFileUtil::WriteDumpFile Start"; - DumpFileUtil::WriteDumpFile(dumpFrontFile_, buffer.addr, bufferSize); - return ret; } @@ -595,52 +580,4 @@ void CodecBridgeCallback::OnNeedOutputData( outputBuffer.outputBufferInfo.offset = info->GetOffset(); signal_->outputQueue_.push(outputBuffer); on_buffers_available_cb_.Run(); -} - -void DumpFileUtil::WriteDumpFile(FILE *dumpFile, void *buffer, size_t bufferSize) -{ - if (dumpFile == nullptr) { - return; - } - if (buffer == nullptr) { - LOG(WARNING) << "DumpFileUtil::WriteDumpFile buffer == nullptr"; - return; - } - size_t writeResult = fwrite(buffer, 1, bufferSize, dumpFile); - if (writeResult != bufferSize) { - LOG(WARNING) << "DumpFileUtil::WriteDumpFile writeResult != bufferSize"; - return; - } - return; -} - -void DumpFileUtil::CloseDumpFile(FILE **dumpFile) -{ - if (*dumpFile == nullptr) { - return; - } - int rc = fclose(*dumpFile); - if (rc != 0) { - LOG(WARNING) << "DumpFileUtil::CloseDumpFile err"; - } - *dumpFile = nullptr; - return; -} - -void DumpFileUtil::OpenDumpFile(std::string filename, FILE **file) -{ - std::string filePath = DUMP_APP_DIR + filename; - FILE *dumpFile = nullptr; - bool res = OHOS::NWeb::OhosAdapterHelper::GetInstance(). - GetSystemPropertiesInstance().GetBoolParameter(DUMP_AUDIO_PARA, false); - if (!res) { - return; - } - dumpFile = fopen(filePath.c_str(), "wb+"); - if (dumpFile == nullptr) { - LOG(WARNING) << "DumpFileUtil::OpenDumpFile fopen failed! filename: " << filename; - return; - } - *file = dumpFile; - return; -} +} \ No newline at end of file diff --git a/media/base/ohos/ohos_media_decoder_bridge_impl.h b/media/base/ohos/ohos_media_decoder_bridge_impl.h index 0f27aaafd1..d9062b1945 100644 --- a/media/base/ohos/ohos_media_decoder_bridge_impl.h +++ b/media/base/ohos/ohos_media_decoder_bridge_impl.h @@ -149,17 +149,8 @@ class MediaCodecDecoderBridgeImpl { scoped_refptr decoder_task_runner_ = nullptr; int32_t width_; int32_t height_; - FILE *dumpFrontFile_ = nullptr; }; -class DumpFileUtil { - public: - static void WriteDumpFile(FILE *dumpFile, void *buffer, size_t bufferSize); - static void CloseDumpFile(FILE **dumpFile); - static void OpenDumpFile(std::string filename, FILE **file); -}; - - } // namespace media #endif // MEDIA_BASE_OHOS_MEDIA_CODEC_BRIDGE_IMPL_H_ -- Gitee From c17d258a849b0bde3dd20a494f9990932ef5e0f9 Mon Sep 17 00:00:00 2001 From: lilei Date: Fri, 13 Dec 2024 17:55:46 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=B8=8D=E8=A7=84=E8=8C=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lilei --- gpu/command_buffer/service/ohos/native_image_image_backing.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/gpu/command_buffer/service/ohos/native_image_image_backing.cc b/gpu/command_buffer/service/ohos/native_image_image_backing.cc index 173a867ce0..2fc5fe2e11 100644 --- a/gpu/command_buffer/service/ohos/native_image_image_backing.cc +++ b/gpu/command_buffer/service/ohos/native_image_image_backing.cc @@ -58,7 +58,6 @@ NativeImageImageBacking::~NativeImageImageBacking() { context_state_.reset(); if (stream_texture_sii_ != nullptr) { stream_texture_sii_->ReleaseResources(); - stream_texture_sii_ = nullptr; stream_texture_sii_.reset(); } } -- Gitee From 2f7602e3f7732338d4d8cbe991e0e1348b7c8aee Mon Sep 17 00:00:00 2001 From: lilei Date: Fri, 13 Dec 2024 18:26:33 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lilei --- media/base/ohos/ohos_media_decoder_bridge_impl.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/media/base/ohos/ohos_media_decoder_bridge_impl.cc b/media/base/ohos/ohos_media_decoder_bridge_impl.cc index aa7bbfae5e..b60cabef2a 100644 --- a/media/base/ohos/ohos_media_decoder_bridge_impl.cc +++ b/media/base/ohos/ohos_media_decoder_bridge_impl.cc @@ -18,7 +18,6 @@ using namespace media; using namespace OHOS::NWeb; using namespace std; - const std::string PRODUCT_MODEL_EMULATOR = "emulator"; void clearInputQueue(std::queue& q) { -- Gitee From 9bd5536084c54afd56706fe049fc2b388d7d3736 Mon Sep 17 00:00:00 2001 From: lilei Date: Sat, 14 Dec 2024 09:44:40 +0000 Subject: [PATCH 7/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20chro?= =?UTF-8?q?mium=5Fsrc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chromium_src | 1 - 1 file changed, 1 deletion(-) delete mode 160000 chromium_src diff --git a/chromium_src b/chromium_src deleted file mode 160000 index ac7d28de63..0000000000 --- a/chromium_src +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ac7d28de634965a84aac3cca10a729db33ff1f16 -- Gitee From ef28beff970552d827fbca0dca4d0349457d3aa6 Mon Sep 17 00:00:00 2001 From: lilei Date: Sat, 14 Dec 2024 10:50:30 +0000 Subject: [PATCH 8/8] =?UTF-8?q?Revert=20"=E5=88=A0=E9=99=A4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20chromium=5Fsrc"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9bd5536084c54afd56706fe049fc2b388d7d3736. --- chromium_src | 1 + 1 file changed, 1 insertion(+) create mode 160000 chromium_src diff --git a/chromium_src b/chromium_src new file mode 160000 index 0000000000..ac7d28de63 --- /dev/null +++ b/chromium_src @@ -0,0 +1 @@ +Subproject commit ac7d28de634965a84aac3cca10a729db33ff1f16 -- Gitee