comparison libmpdemux/demux_mov.c @ 21827:b0bc0d81f91b

Subtitle handling cleanup: factor out code for parsing embedded subtitles and adding and removing of lines in subtitle struct into subreader.c.

21826:d4dbadf11019

        sh_sub_t *sh = demuxer->sub->sh;
        off_t pos = trak->samples[samplenr].pos;
        int len = trak->samples[samplenr].size;
        double subpts = (double)trak->samples[samplenr].pts / (double)trak->timescale;
        stream_seek(demuxer->stream, pos);
        if (sh->type == 'v')
          ds_read_packet(demuxer->sub, demuxer->stream, len, subpts, pos, 0);
        else {
          int i;
          char *line = priv->subtext;
          stream_skip(demuxer->stream, 2); // size
          len -= 2;
          if (len < 0) len = 0;
          if (len > MOV_MAX_SUBLEN) len = MOV_MAX_SUBLEN;
          stream_read(demuxer->stream, priv->subtext, len);
          priv->subtext[len] = 0;
          priv->subs.lines = 1;
          priv->subs.text[0] = &priv->subtext;
          while ((line = strchr(line, '\n'))) {
            *line++ = 0;
            priv->subs.text[priv->subs.lines] = line;
            priv->subs.lines++;
          }
          vo_sub = &priv->subs;
        }
        priv->current_sub = samplenr;
      }
      vo_osd_changed (OSDTYPE_SUBTITLE);
    }

    return 1;
    
}

21827:b0bc0d81f91b

        sh_sub_t *sh = demuxer->sub->sh;
        off_t pos = trak->samples[samplenr].pos;
        int len = trak->samples[samplenr].size;
        double subpts = (double)trak->samples[samplenr].pts / (double)trak->timescale;
        stream_seek(demuxer->stream, pos);
        if (sh->type != 'v') {
          stream_skip(demuxer->stream, 2); // size
          len -= 2;
          if (len < 0) len = 0;
          if (len > MOV_MAX_SUBLEN) len = MOV_MAX_SUBLEN;
        }
        ds_read_packet(demuxer->sub, demuxer->stream, len, subpts, pos, 0);
        priv->current_sub = samplenr;
      }
    }

    return 1;
    
}