Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub Actions: fix Fedora CMake build #910

Merged
merged 4 commits into from
Jul 6, 2024
Merged

GitHub Actions: fix Fedora CMake build #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fa8fc9
libavformat/mpegts: rename ff_parse_mpeg2_descriptor()
ulmus-scott Jun 2, 2024
8dd401d
libavformat/mpegts: rename avpriv_mpegts_parse_*()
ulmus-scott Jun 2, 2024
ce41d1b
mythbackend/CMakeLists.txt: add missing header
ulmus-scott Jun 2, 2024
9273ba3
libavformat/mpegts.h: match space with ffmpeg
ulmus-scott Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions mythtv/external/FFmpeg/libavformat/mpegts-mythtv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1920,7 +1920,7 @@ static const uint8_t opus_channel_map[8][8] = {
{ 0,6,1,2,3,4,5,7 },
};

int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type,
int ff_mythtv_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type,
const uint8_t **pp, const uint8_t *desc_list_end,
Mp4Descr *mp4_descr, int mp4_descr_count, int pid,
MpegTSContext *ts)
Expand Down Expand Up @@ -2946,7 +2946,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
if (desc_list_end > p_end)
goto out;
for (;;) {
if (ff_parse_mpeg2_descriptor(ts->stream, st, stream_type, &p,
if (ff_mythtv_parse_mpeg2_descriptor(ts->stream, st, stream_type, &p,
desc_list_end, mp4_descr,
mp4_descr_count, pid, ts) < 0)
break;
Expand Down Expand Up @@ -4012,7 +4012,7 @@ static int64_t mpegts_get_dts(AVFormatContext *s, int stream_index,
/**************************************************************/
/* parsing functions - called from other demuxers such as RTP */

MpegTSContext *avpriv_mpegts_parse_open(AVFormatContext *s)
MpegTSContext *avpriv_mythtv_mpegts_parse_open(AVFormatContext *s)
{
MpegTSContext *ts;

Expand All @@ -4034,7 +4034,7 @@ MpegTSContext *avpriv_mpegts_parse_open(AVFormatContext *s)

/* return the consumed length if a packet was output, or -1 if no
* packet is output */
int avpriv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
int avpriv_mythtv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
const uint8_t *buf, int len)
{
int len1;
Expand All @@ -4059,7 +4059,7 @@ int avpriv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
return len1 - len;
}

void avpriv_mpegts_parse_close(MpegTSContext *ts)
void avpriv_mythtv_mpegts_parse_close(MpegTSContext *ts)
{
mpegts_free(ts);
av_free(ts);
Expand Down
8 changes: 4 additions & 4 deletions mythtv/external/FFmpeg/libavformat/mpegts-mythtv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,10 @@

typedef struct MpegTSContext MpegTSContext;

MpegTSContext *avpriv_mpegts_parse_open(AVFormatContext *s);
int avpriv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
MpegTSContext *avpriv_mythtv_mpegts_parse_open(AVFormatContext *s);
int avpriv_mythtv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
const uint8_t *buf, int len);
void avpriv_mpegts_parse_close(MpegTSContext *ts);
void avpriv_mythtv_mpegts_parse_close(MpegTSContext *ts);

typedef struct SLConfigDescr {
int use_au_start;
Expand Down Expand Up @@ -236,7 +236,7 @@ typedef struct DVBAC3Descriptor {
* @param desc_list_end End of buffer
* @return <0 to stop processing
*/
int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type,
int ff_mythtv_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type,
const uint8_t **pp, const uint8_t *desc_list_end,
Mp4Descr *mp4_descr, int mp4_descr_count, int pid,
MpegTSContext *ts);
Expand Down
10 changes: 5 additions & 5 deletions mythtv/external/FFmpeg/libavformat/mpegts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1806,7 +1806,7 @@ static const uint8_t opus_channel_map[8][8] = {
{ 0,6,1,2,3,4,5,7 },
};

int ff_old_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type,
int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type,
const uint8_t **pp, const uint8_t *desc_list_end,
Mp4Descr *mp4_descr, int mp4_descr_count, int pid,
MpegTSContext *ts)
Expand Down Expand Up @@ -2504,7 +2504,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
if (desc_list_end > p_end)
goto out;
for (;;) {
if (ff_old_parse_mpeg2_descriptor(ts->stream, st, stream_type, &p,
if (ff_parse_mpeg2_descriptor(ts->stream, st, stream_type, &p,
desc_list_end, mp4_descr,
mp4_descr_count, pid, ts) < 0)
break;
Expand Down Expand Up @@ -3371,7 +3371,7 @@ static int64_t mpegts_get_dts(AVFormatContext *s, int stream_index,
/**************************************************************/
/* parsing functions - called from other demuxers such as RTP */

MpegTSContext *avpriv_old_mpegts_parse_open(AVFormatContext *s)
MpegTSContext *avpriv_mpegts_parse_open(AVFormatContext *s)
{
MpegTSContext *ts;

Expand All @@ -3393,7 +3393,7 @@ MpegTSContext *avpriv_old_mpegts_parse_open(AVFormatContext *s)

/* return the consumed length if a packet was output, or -1 if no
* packet is output */
int avpriv_old_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
int avpriv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
const uint8_t *buf, int len)
{
int len1;
Expand All @@ -3418,7 +3418,7 @@ int avpriv_old_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
return len1 - len;
}

void avpriv_old_mpegts_parse_close(MpegTSContext *ts)
void avpriv_mpegts_parse_close(MpegTSContext *ts)
{
mpegts_free(ts);
av_free(ts);
Expand Down
10 changes: 5 additions & 5 deletions mythtv/external/FFmpeg/libavformat/mpegts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@

typedef struct MpegTSContext MpegTSContext;

MpegTSContext *avpriv_old_mpegts_parse_open(AVFormatContext *s);
int avpriv_old_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
const uint8_t *buf, int len);
void avpriv_old_mpegts_parse_close(MpegTSContext *ts);
MpegTSContext *avpriv_mpegts_parse_open(AVFormatContext *s);
int avpriv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
const uint8_t *buf, int len);
void avpriv_mpegts_parse_close(MpegTSContext *ts);

typedef struct SLConfigDescr {
int use_au_start;
Expand Down Expand Up @@ -220,7 +220,7 @@ typedef struct DVBAC3Descriptor {
* @param desc_list_end End of buffer
* @return <0 to stop processing
*/
int ff_old_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type,
int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type,
const uint8_t **pp, const uint8_t *desc_list_end,
Mp4Descr *mp4_descr, int mp4_descr_count, int pid,
MpegTSContext *ts);
Expand Down
8 changes: 4 additions & 4 deletions mythtv/external/FFmpeg/libavformat/rtpdec_mpegts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ static void mpegts_close_context(PayloadContext *data)
if (!data)
return;
if (data->ts)
avpriv_mpegts_parse_close(data->ts);
avpriv_mythtv_mpegts_parse_close(data->ts);
}

static av_cold int mpegts_init(AVFormatContext *ctx, int st_index,
PayloadContext *data)
{
data->ts = avpriv_mpegts_parse_open(ctx);
data->ts = avpriv_mythtv_mpegts_parse_open(ctx);
if (!data->ts)
return AVERROR(ENOMEM);
return 0;
Expand All @@ -63,7 +63,7 @@ static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data,
if (!buf) {
if (data->read_buf_index >= data->read_buf_size)
return AVERROR(EAGAIN);
ret = avpriv_mpegts_parse_packet(data->ts, pkt, data->buf + data->read_buf_index,
ret = avpriv_mythtv_mpegts_parse_packet(data->ts, pkt, data->buf + data->read_buf_index,
data->read_buf_size - data->read_buf_index);
if (ret < 0)
return AVERROR(EAGAIN);
Expand All @@ -74,7 +74,7 @@ static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data,
return 0;
}

ret = avpriv_mpegts_parse_packet(data->ts, pkt, buf, len);
ret = avpriv_mythtv_mpegts_parse_packet(data->ts, pkt, buf, len);
/* The only error that can be returned from avpriv_mpegts_parse_packet
* is "no more data to return from the provided buffer", so return
* AVERROR(EAGAIN) for all errors */
Expand Down
8 changes: 4 additions & 4 deletions mythtv/external/FFmpeg/libavformat/rtsp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
/* no corresponding stream */
if (rt->transport == RTSP_TRANSPORT_RAW) {
if (CONFIG_RTPDEC && !rt->ts)
rt->ts = avpriv_mpegts_parse_open(s);
rt->ts = avpriv_mythtv_mpegts_parse_open(s);
} else {
const RTPDynamicProtocolHandler *handler;
handler = ff_rtp_handler_find_by_id(
Expand Down Expand Up @@ -817,7 +817,7 @@ void ff_rtsp_close_streams(AVFormatContext *s)
avformat_close_input(&rt->asf_ctx);
}
if (CONFIG_RTPDEC && rt->ts)
avpriv_mpegts_parse_close(rt->ts);
avpriv_mythtv_mpegts_parse_close(rt->ts);
av_freep(&rt->p);
av_freep(&rt->recvbuf);
}
Expand Down Expand Up @@ -2213,7 +2213,7 @@ int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt)
} else if (rt->transport == RTSP_TRANSPORT_RTP) {
ret = ff_rtp_parse_packet(rt->cur_transport_priv, pkt, NULL, 0);
} else if (CONFIG_RTPDEC && rt->ts) {
ret = avpriv_mpegts_parse_packet(rt->ts, pkt, rt->recvbuf + rt->recvbuf_pos, rt->recvbuf_len - rt->recvbuf_pos);
ret = avpriv_mythtv_mpegts_parse_packet(rt->ts, pkt, rt->recvbuf + rt->recvbuf_pos, rt->recvbuf_len - rt->recvbuf_pos);
if (ret >= 0) {
rt->recvbuf_pos += ret;
ret = rt->recvbuf_pos < rt->recvbuf_len;
Expand Down Expand Up @@ -2328,7 +2328,7 @@ int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt)
}
}
} else if (CONFIG_RTPDEC && rt->ts) {
ret = avpriv_mpegts_parse_packet(rt->ts, pkt, rt->recvbuf, len);
ret = avpriv_mythtv_mpegts_parse_packet(rt->ts, pkt, rt->recvbuf, len);
if (ret >= 0) {
if (ret < len) {
rt->recvbuf_len = len;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/external/FFmpeg/libavformat/wtvdec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p
buf_size = FFMIN(len - consumed, sizeof(buf));
avio_read(pb, buf, buf_size);
consumed += buf_size;
ff_old_parse_mpeg2_descriptor(s, st, 0, &pbuf, buf + buf_size, NULL, 0, 0, NULL);
ff_parse_mpeg2_descriptor(s, st, 0, &pbuf, buf + buf_size, NULL, 0, 0, NULL);
}
} else if (!ff_guidcmp(g, EVENTID_AudioTypeSpanningEvent)) {
int stream_index = ff_find_stream_index(s, sid);
Expand Down
1 change: 1 addition & 0 deletions mythtv/programs/mythbackend/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ add_executable(
servicesv2/v2channelGroup.h
servicesv2/v2channelGroupList.h
servicesv2/v2channelInfoList.h
servicesv2/v2channelRestore.h
servicesv2/v2channelScan.h
servicesv2/v2commMethod.h
servicesv2/v2config.cpp
Expand Down