| Message ID | 1603848684-32691-1-git-send-email-lance.lmwang@gmail.com |
|---|---|
| State | Accepted |
| Commit | 27e8a6c44bbe349827990783b7ebd9a44073c4c9 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avformat/mpegtsenc: first_pts_check -> first_pts_checked | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
On Wed, 28 Oct 2020, lance.lmwang@gmail.com wrote: > From: Limin Wang <lance.lmwang@gmail.com> > > change to first_pts_checked and reverse the logic. > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > libavformat/mpegtsenc.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c > index 29dcaf6..383181d 100644 > --- a/libavformat/mpegtsenc.c > +++ b/libavformat/mpegtsenc.c > @@ -232,7 +232,7 @@ typedef struct MpegTSWriteStream { > int cc; > int discontinuity; > int payload_size; > - int first_pts_check; ///< first pts check needed > + int first_pts_checked; ///< first pts check needed > int prev_payload_key; > int64_t payload_pts; > int64_t payload_dts; > @@ -1101,7 +1101,6 @@ static int mpegts_init(AVFormatContext *s) > } > ts_st->payload_pts = AV_NOPTS_VALUE; > ts_st->payload_dts = AV_NOPTS_VALUE; > - ts_st->first_pts_check = 1; > ts_st->cc = 15; > ts_st->discontinuity = ts->flags & MPEGTS_FLAG_DISCONT; > if (st->codecpar->codec_id == AV_CODEC_ID_AAC && > @@ -1700,11 +1699,11 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) > dts += delay; > } > > - if (ts_st->first_pts_check && pts == AV_NOPTS_VALUE) { > + if (!ts_st->first_pts_checked && pts == AV_NOPTS_VALUE) { > av_log(s, AV_LOG_ERROR, "first pts value must be set\n"); > return AVERROR_INVALIDDATA; > } > - ts_st->first_pts_check = 0; > + ts_st->first_pts_checked = 1; LGTM, thanks. Regards, Marton > > if (st->codecpar->codec_id == AV_CODEC_ID_H264) { > const uint8_t *p = buf, *buf_end = p + size; > -- > 1.8.3.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 29dcaf6..383181d 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -232,7 +232,7 @@ typedef struct MpegTSWriteStream { int cc; int discontinuity; int payload_size; - int first_pts_check; ///< first pts check needed + int first_pts_checked; ///< first pts check needed int prev_payload_key; int64_t payload_pts; int64_t payload_dts; @@ -1101,7 +1101,6 @@ static int mpegts_init(AVFormatContext *s) } ts_st->payload_pts = AV_NOPTS_VALUE; ts_st->payload_dts = AV_NOPTS_VALUE; - ts_st->first_pts_check = 1; ts_st->cc = 15; ts_st->discontinuity = ts->flags & MPEGTS_FLAG_DISCONT; if (st->codecpar->codec_id == AV_CODEC_ID_AAC && @@ -1700,11 +1699,11 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) dts += delay; } - if (ts_st->first_pts_check && pts == AV_NOPTS_VALUE) { + if (!ts_st->first_pts_checked && pts == AV_NOPTS_VALUE) { av_log(s, AV_LOG_ERROR, "first pts value must be set\n"); return AVERROR_INVALIDDATA; } - ts_st->first_pts_check = 0; + ts_st->first_pts_checked = 1; if (st->codecpar->codec_id == AV_CODEC_ID_H264) { const uint8_t *p = buf, *buf_end = p + size;