lkml.org 
[lkml]   [2020]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/31] media: vidtv: fix service_id at SDT table
    Date
    The service_id there should be equal to the one used
    on other tables, otherwise, EIT entries won't be valid.

    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    ---
    drivers/media/test-drivers/vidtv/vidtv_channel.c | 3 ++-
    drivers/media/test-drivers/vidtv/vidtv_psi.c | 5 +++--
    drivers/media/test-drivers/vidtv/vidtv_psi.h | 3 ++-
    3 files changed, 7 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/test-drivers/vidtv/vidtv_channel.c b/drivers/media/test-drivers/vidtv/vidtv_channel.c
    index eaa596f5520f..023e3dc04ce2 100644
    --- a/drivers/media/test-drivers/vidtv/vidtv_channel.c
    +++ b/drivers/media/test-drivers/vidtv/vidtv_channel.c
    @@ -425,7 +425,8 @@ int vidtv_channel_si_init(struct vidtv_mux *m)
    if (!m->si.pat)
    return -ENOMEM;

    - m->si.sdt = vidtv_psi_sdt_table_init(m->transport_stream_id);
    + m->si.sdt = vidtv_psi_sdt_table_init(m->network_id,
    + m->transport_stream_id);
    if (!m->si.sdt)
    goto free_pat;

    diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.c b/drivers/media/test-drivers/vidtv/vidtv_psi.c
    index 5c887639b676..77bb560342a6 100644
    --- a/drivers/media/test-drivers/vidtv/vidtv_psi.c
    +++ b/drivers/media/test-drivers/vidtv/vidtv_psi.c
    @@ -1271,7 +1271,8 @@ void vidtv_psi_pmt_table_destroy(struct vidtv_psi_table_pmt *pmt)
    kfree(pmt);
    }

    -struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_init(u16 transport_stream_id)
    +struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_init(u16 network_id,
    + u16 transport_stream_id)
    {
    struct vidtv_psi_table_sdt *sdt;
    const u16 RESERVED = 0xff;
    @@ -1307,7 +1308,7 @@ struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_init(u16 transport_stream_id)
    * This can be changed to something more useful, when support for
    * NIT gets added
    */
    - sdt->network_id = cpu_to_be16(0xff01);
    + sdt->network_id = cpu_to_be16(network_id);
    sdt->reserved = RESERVED;

    vidtv_psi_sdt_table_update_sec_len(sdt);
    diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.h b/drivers/media/test-drivers/vidtv/vidtv_psi.h
    index 3937d1dde3f4..1bf0103e6840 100644
    --- a/drivers/media/test-drivers/vidtv/vidtv_psi.h
    +++ b/drivers/media/test-drivers/vidtv/vidtv_psi.h
    @@ -366,7 +366,8 @@ struct vidtv_psi_table_pat *vidtv_psi_pat_table_init(u16 transport_stream_id);
    struct vidtv_psi_table_pmt *vidtv_psi_pmt_table_init(u16 program_number,
    u16 pcr_pid);

    -struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_init(u16 transport_stream_id);
    +struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_init(u16 network_id,
    + u16 transport_stream_id);

    struct vidtv_psi_table_sdt_service*
    vidtv_psi_sdt_service_init(struct vidtv_psi_table_sdt_service *head,
    --
    2.28.0
    \
     
     \ /
      Last update: 2020-11-24 12:12    [W:3.372 / U:0.380 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site