From patchwork Mon Jan 23 09:05:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 2289 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1142469vsb; Mon, 23 Jan 2017 01:06:05 -0800 (PST) X-Received: by 10.28.227.133 with SMTP id a127mr11887910wmh.104.1485162365663; Mon, 23 Jan 2017 01:06:05 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m89si13540340wmh.34.2017.01.23.01.06.05; Mon, 23 Jan 2017 01:06:05 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BFAD068A18A; Mon, 23 Jan 2017 11:05:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau2.qq.com (smtpbgau2.qq.com [54.206.34.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FF2E68A175 for ; Mon, 23 Jan 2017 11:05:42 +0200 (EET) X-QQ-mid: bizesmtp7t1485162339txjakra2u Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 23 Jan 2017 17:05:38 +0800 (CST) X-QQ-SSF: 01100000002000F0F720B00A0000000 X-QQ-FEAT: oIoGrveFQB/E16ztLxMnwN1bI+OV0GBEOatelHwYAcdsihOSVKcsmSyKSVxGJ 99BE0bSbRfZ2oJxRp+jmGeP6yZLFugm5h9FVT8CMXibf7AotVDt2Dmqp1pZh+HYEw50a8tz Lq88SkPdGRfc9Zvi/Qy3Fj+MR02BhvIXjm85V2h12CYvxh5Lg5gUYHvk4wZGX1/QBTLSnal wG74mOzPdjP3OWHWkau9Ca9Kvyk+kMtLN7icqV1tgxIFPE9DvH15Vw1PCgAe9kbLFOUuRee DaokV8nJX4n+xmGc879D1E1ZU= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Jan 2017 17:05:30 +0800 Message-Id: <20170123090530.9180-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/flvenc: refine the flvenc shift_data code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" refine the flvenc shift_data move data option Signed-off-by: Steven Liu --- libavformat/flvenc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 5714321..d7506c5 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -626,13 +626,15 @@ static int shift_data(AVFormatContext *s) avio_seek(read_pb, flv->keyframes_info_offset, SEEK_SET); pos = avio_tell(read_pb); - /* shift data by chunk of at most keyframe *filepositions* and *times* size */ +#define READ_BLOCK do { \ read_size[read_buf_id] = avio_read(read_pb, read_buf[read_buf_id], metadata_size); \ - read_buf_id ^= 1; - do { + read_buf_id ^= 1; \ +} while (0) - read_size[read_buf_id] = avio_read(read_pb, read_buf[read_buf_id], metadata_size); \ - read_buf_id ^= 1; + /* shift data by chunk of at most keyframe *filepositions* and *times* size */ + READ_BLOCK; + do { + READ_BLOCK; n = read_size[read_buf_id]; if (n < 0) break;