From 0c28820dcde47398f98a5152694f68f6ae221960 Mon Sep 17 00:00:00 2001
From: Byoungchan Lee <daniel.l@hpcnt.com>
Date: Thu, 24 Mar 2022 17:40:03 +0900
Subject: [PATCH] Fix FRAME delimiter is not handled properly in yuv/y4m reader

Note that sdk/android/api/org/webrtc/FileVideoCapturer.java is handling
correctly.

Bug: None
Change-Id: I3a9783d75bd0a4b3a454b87a01039154200c4d29
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256581
Auto-Submit: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36315}
---
 rtc_tools/video_file_reader.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rtc_tools/video_file_reader.cc b/rtc_tools/video_file_reader.cc
index c6fa5870e8..6e722b1235 100644
--- a/rtc_tools/video_file_reader.cc
+++ b/rtc_tools/video_file_reader.cc
@@ -204,9 +204,10 @@ rtc::scoped_refptr<Video> OpenY4mFile(const std::string& file_name) {
   const int i420_frame_size = 3 * *width * *height / 2;
   std::vector<fpos_t> frame_positions;
   while (true) {
-    int parse_frame_header_result = -1;
-    if (fscanf(file, "FRAME\n%n", &parse_frame_header_result) != 0 ||
-        parse_frame_header_result == -1) {
+    std::array<char, 6> read_buffer;
+    if (fread(read_buffer.data(), 1, read_buffer.size(), file) <
+            read_buffer.size() ||
+        memcmp(read_buffer.data(), "FRAME\n", read_buffer.size()) != 0) {
       if (!feof(file)) {
         RTC_LOG(LS_ERROR) << "Did not find FRAME header, ignoring rest of file";
       }