fix avformat struct definitions #153
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I removed all the fields that were not being used from the MpegTS* structs. Then I looked at the differences between the struct definitions between what was committed and what was in the ffmpeg repo. For the difference that mattered I checked the git history and added a version check to include the field. Futhermore, the MpegTSWriteStream struct supposedly contained a pointer to a MpegTSService struct, however, I could not find any version of ffmpeg where this field exists. I removed it and removed the 2 references to it. After these changes, I'm able to build picam and I no longer get a segfault in hls_write_packet when dereferencing ts_st->service (see a backtrace here iizukanao#144 (comment)).
marler8997
commented
Jan 22, 2021
| @@ -347,9 +315,6 @@ int hls_write_packet(HTTPLiveStreaming *hls, AVPacket *pkt, int split) { | |||
| for (i = 0; i < nb_streams; i++) { | |||
| ts_st = hls->format_ctx->streams[i]->priv_data; | |||
| stream_cc[i] = ts_st->cc; | |||
| if (i == 0) { | |||
There was a problem hiding this comment.
Note I don't really know what these 3 lines or the 3 lines below (369-371) were for. They just had to be removed because there's no references to a service structure in ts_st, so I just removed them. Feel free to enlighten me if this is incorrect.
There was a problem hiding this comment.
That code was to retain the value of continuity counter for Program Map Table (PID 4096) between two consecutive *.ts files. I've added the code for it at commit 6684cfe.
|
@marler8997 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I removed all the fields that were not being used from the MpegTS* structs. Then I looked at the differences between the struct definitions between what was committed and what was in the ffmpeg repo. For the difference that mattered I checked the git history and added a version check to include the field.
Futhermore, the MpegTSWriteStream struct supposedly contained a pointer to a MpegTSService struct, however, I could not find any version of ffmpeg where this field exists. I removed it and removed the 2 references to it.
After these changes, I'm able to build picam and I no longer get a segfault in hls_write_packet when dereferencing ts_st->service (see a backtrace here #144 (comment)).
this is fix 1 of 2 for issue #144