36 changed files with 683 additions and 2521 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -47,7 +47,6 @@ serde_with = { version = "3.0.0", default-features = false, features = [
    "macros",
    "json",
 ] }
-serde_plain = "1.0.1"
 rand = "0.8.5"
 time = { version = "0.3.15", features = [
    "macros",
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@ -8,7 +8,7 @@ use reqwest::{Client, ClientBuilder};
 use rustypipe::{
    client::RustyPipe,
    model::{UrlTarget, VideoId},
-    param::{search_filter, ChannelVideoTab, StreamFilter},
+    param::{search_filter, StreamFilter},
 };
 use serde::Serialize;

@ -113,7 +113,6 @@ enum ChannelTab {
    Videos,
    Shorts,
    Live,
-    Playlists,
    Info,
 }

@ -565,16 +564,8 @@ async fn main() {
                        print_data(&artist, format, pretty);
                    } else {
                        match tab {
-                            ChannelTab::Videos | ChannelTab::Shorts | ChannelTab::Live => {
-                                let video_tab = match tab {
-                                    ChannelTab::Videos => ChannelVideoTab::Videos,
-                                    ChannelTab::Shorts => ChannelVideoTab::Shorts,
-                                    ChannelTab::Live => ChannelVideoTab::Live,
-                                    _ => unreachable!(),
-                                };
-                                let mut channel =
-                                    rp.query().channel_videos_tab(&id, video_tab).await.unwrap();
-
+                            ChannelTab::Videos => {
+                                let mut channel = rp.query().channel_videos(&id).await.unwrap();
                                channel
                                    .content
                                    .extend_limit(rp.query(), limit)
@ -582,8 +573,23 @@ async fn main() {
                                    .unwrap();
                                print_data(&channel, format, pretty);
                            }
-                            ChannelTab::Playlists => {
-                                let channel = rp.query().channel_playlists(&id).await.unwrap();
+                            ChannelTab::Shorts => {
+                                let mut channel = rp.query().channel_shorts(&id).await.unwrap();
+                                channel
+                                    .content
+                                    .extend_limit(rp.query(), limit)
+                                    .await
+                                    .unwrap();
+                                print_data(&channel, format, pretty);
+                            }
+                            ChannelTab::Live => {
+                                let mut channel =
+                                    rp.query().channel_livestreams(&id).await.unwrap();
+                                channel
+                                    .content
+                                    .extend_limit(rp.query(), limit)
+                                    .await
+                                    .unwrap();
                                print_data(&channel, format, pretty);
                            }
                            ChannelTab::Info => {
--- a/codegen/src/download_testfiles.rs
+++ b/codegen/src/download_testfiles.rs
@ -10,7 +10,7 @@ use rustypipe::{
    client::{ClientType, RustyPipe},
    param::{
        search_filter::{self, ItemType, SearchFilter},
-        ChannelVideoTab, Country,
+        Country,
    },
    report::{Report, Reporter},
 };
@ -305,7 +305,7 @@ async fn channel_shorts() {

    let rp = rp_testfile(&json_path);
    rp.query()
-        .channel_videos_tab("UCh8gHdtzO2tXd593_bjErWg", ChannelVideoTab::Shorts)
+        .channel_shorts("UCh8gHdtzO2tXd593_bjErWg")
        .await
        .unwrap();
 }
@ -318,7 +318,7 @@ async fn channel_livestreams() {

    let rp = rp_testfile(&json_path);
    rp.query()
-        .channel_videos_tab("UC2DjFE7Xf11URZqWBigcVOQ", ChannelVideoTab::Live)
+        .channel_livestreams("UC2DjFE7Xf11URZqWBigcVOQ")
        .await
        .unwrap();
 }
--- a/codegen/src/gen_locales.rs
+++ b/codegen/src/gen_locales.rs
@ -1,7 +1,5 @@
 use std::collections::BTreeMap;
 use std::fmt::Write;
-use std::fs::File;
-use std::io::BufReader;

 use path_macro::path;
 use reqwest::header;
@ -11,7 +9,6 @@ use serde_with::serde_as;
 use serde_with::VecSkipError;

 use crate::model::Text;
-use crate::util::DICT_DIR;
 use crate::util::SRC_DIR;

 #[serde_as]
@ -144,45 +141,44 @@ struct LanguageCountryCommand {
 pub async fn generate_locales() {
    let (languages, countries) = get_locales().await;

-    let json_path = path!(*DICT_DIR / "lang_names.json");
-    let json_file = File::open(json_path).unwrap();
-    let lang_names: BTreeMap<String, String> =
-        serde_json::from_reader(BufReader::new(json_file)).unwrap();
-
    let code_head = r#"// This file is automatically generated. DO NOT EDIT.

 //! Languages and countries

-use std::str::FromStr;
+use std::{fmt::Display, str::FromStr};

 use serde::{Deserialize, Serialize};
-
-use crate::error::Error;
 "#;

-    let code_foot = r#"impl FromStr for Language {
-    type Err = Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut sub = s;
-        loop {
-            if let Ok(v) = serde_plain::from_str(sub) {
-                return Ok(v);
-            }
-            match sub.rfind('-') {
-                Some(pos) => {
-                    sub = &sub[..pos];
-                }
-                None => return Err(Error::Other("could not parse language `{s}`".into())),
-            }
-        }
+    let code_foot = r#"impl Display for Language {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(
+            &serde_json::to_string(self).map_or("".to_owned(), |s| s[1..s.len() - 1].to_owned()),
+        )
    }
 }

-serde_plain::derive_display_from_serialize!(Language);
+impl Display for Country {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(
+            &serde_json::to_string(self).map_or("".to_owned(), |s| s[1..s.len() - 1].to_owned()),
+        )
+    }
+}

-serde_plain::derive_fromstr_from_deserialize!(Country, Error);
-serde_plain::derive_display_from_serialize!(Country);
+impl FromStr for Language {
+    type Err = serde_json::Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        serde_json::from_str(&format!("\"{}\"", s))
+    }
+}
+
+impl FromStr for Country {
+    type Err = serde_json::Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        serde_json::from_str(&format!("\"{}\"", s))
+    }
+}
 "#;

    let mut code_langs = r#"/// Available languages
@ -227,8 +223,8 @@ pub enum Country {
 "#
    .to_owned();

-    languages.iter().for_each(|(code, native_name)| {
-        let enum_name = code
+    languages.iter().for_each(|(c, n)| {
+        let enum_name = c
            .split('-')
            .map(|c| {
                format!(
@ -239,16 +235,10 @@ pub enum Country {
            })
            .collect::<String>();

-        let en_name = lang_names.get(code).expect(code);
-
        // Language enum
-        if en_name == native_name || code.starts_with("en") {
-            write!(code_langs, "    /// {native_name}\n    ").unwrap();
-        } else {
-            write!(code_langs, "    /// {en_name} / {native_name}\n    ").unwrap();
-        }
-        if code.contains('-') {
-            write!(code_langs, "#[serde(rename = \"{code}\")]\n    ").unwrap();
+        write!(code_langs, "    /// {n}\n    ").unwrap();
+        if c.contains('-') {
+            write!(code_langs, "#[serde(rename = \"{c}\")]\n    ").unwrap();
        }
        code_langs += &enum_name;
        code_langs += ",\n";
@ -259,7 +249,7 @@ pub enum Country {
        // Language names
        writeln!(
            code_lang_names,
-            "            Language::{enum_name} => \"{native_name}\","
+            "            Language::{enum_name} => \"{n}\","
        )
        .unwrap();
    });
--- a/notes/channel_order.md
+++ b/notes/channel_order.md
@ -1,69 +0,0 @@
-# Channel order
-
-Fields:
-
- `2:0:string` Channel ID
- `15:0:embedded` Videos tab
- `10:0:embedded` Shorts tab
- `14:0:embedded` Livestreams tab
- `2:0:string`: targetId for YouTube's web framework (`"\n$"` + any UUID)
- `3:1:varint` Sort order (1: Latest, 2: Popular)
-
-Popular videos
-
-```json
-{
-  "80226972:0:embedded": {
-    "2:0:string": "UCXuqSBlHAE6Xw-yeJA0Tunw",
-    "3:1:base64": {
-      "110:0:embedded": {
-        "3:0:embedded": {
-          "15:0:embedded": {
-            "2:0:string": "\n$6461d7c8-0000-2040-87aa-089e0827e420",
-            "3:1:varint": 2
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-Popular shorts
-```json
-{
-  "80226972:0:embedded": {
-    "2:0:string": "UCXuqSBlHAE6Xw-yeJA0Tunw",
-    "3:1:base64": {
-      "110:0:embedded": {
-        "3:0:embedded": {
-          "10:0:embedded": {
-            "2:0:string": "\n$64679ffb-0000-26b3-a1bd-582429d2c794",
-            "3:1:varint": 2
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-Popular streams
-
-```json
-{
-  "80226972:0:embedded": {
-    "2:0:string": "UCXuqSBlHAE6Xw-yeJA0Tunw",
-    "3:1:base64": {
-      "110:0:embedded": {
-        "3:0:embedded": {
-          "14:0:embedded": {
-            "2:0:string": "\n$64693069-0000-2a1e-8c7d-582429bd5ba8",
-            "3:1:varint": 2
-          }
-        }
-      }
-    }
-  }
-}
-```
--- a/src/client/channel.rs
+++ b/src/client/channel.rs
@ -1,15 +1,14 @@
+use std::borrow::Cow;
+
 use serde::Serialize;
 use url::Url;

 use crate::{
    error::{Error, ExtractionError},
-    model::{
-        paginator::{ContinuationEndpoint, Paginator},
-        Channel, ChannelInfo, PlaylistItem, VideoItem, YouTubeItem,
-    },
-    param::{ChannelOrder, ChannelVideoTab, Language},
+    model::{paginator::Paginator, Channel, ChannelInfo, PlaylistItem, VideoItem, YouTubeItem},
+    param::Language,
    serializer::MapResult,
-    util::{self, ProtoBuilder},
+    util,
 };

 use super::{response, ClientType, MapResponse, RustyPipeQuery, YTContext};
@ -19,13 +18,13 @@ use super::{response, ClientType, MapResponse, RustyPipeQuery, YTContext};
 struct QChannel<'a> {
    context: YTContext<'a>,
    browse_id: &'a str,
-    params: ChannelTab,
+    params: Params,
    #[serde(skip_serializing_if = "Option::is_none")]
    query: Option<&'a str>,
 }

 #[derive(Debug, Serialize)]
-enum ChannelTab {
+enum Params {
    #[serde(rename = "EgZ2aWRlb3PyBgQKAjoA")]
    Videos,
    #[serde(rename = "EgZzaG9ydHPyBgUKA5oBAA%3D%3D")]
@ -40,21 +39,11 @@ enum ChannelTab {
    Search,
 }

-impl From<ChannelVideoTab> for ChannelTab {
-    fn from(value: ChannelVideoTab) -> Self {
-        match value {
-            ChannelVideoTab::Videos => Self::Videos,
-            ChannelVideoTab::Shorts => Self::Shorts,
-            ChannelVideoTab::Live => Self::Live,
-        }
-    }
-}
-
 impl RustyPipeQuery {
    async fn _channel_videos<S: AsRef<str>>(
        &self,
        channel_id: S,
-        params: ChannelTab,
+        params: Params,
        query: Option<&str>,
        operation: &str,
    ) -> Result<Channel<Paginator<VideoItem>>, Error> {
@ -82,52 +71,26 @@ impl RustyPipeQuery {
        &self,
        channel_id: S,
    ) -> Result<Channel<Paginator<VideoItem>>, Error> {
-        self._channel_videos(channel_id, ChannelTab::Videos, None, "channel_videos")
+        self._channel_videos(channel_id, Params::Videos, None, "channel_videos")
            .await
    }

-    /// Get a ordered list of videos from a YouTube channel
-    ///
-    /// This function does not return channel metadata.
-    pub async fn channel_videos_order<S: AsRef<str>>(
+    /// Get the short videos from a YouTube channel
+    pub async fn channel_shorts<S: AsRef<str>>(
        &self,
        channel_id: S,
-        order: ChannelOrder,
-    ) -> Result<Paginator<VideoItem>, Error> {
-        self.channel_videos_tab_order(channel_id, ChannelVideoTab::Videos, order)
-            .await
-    }
-
-    /// Get the specified video tab from a YouTube channel
-    pub async fn channel_videos_tab<S: AsRef<str>>(
-        &self,
-        channel_id: S,
-        tab: ChannelVideoTab,
    ) -> Result<Channel<Paginator<VideoItem>>, Error> {
-        self._channel_videos(channel_id, tab.into(), None, "channel_videos")
+        self._channel_videos(channel_id, Params::Shorts, None, "channel_shorts")
            .await
    }

-    /// Get a ordered list of videos from the specified tab of a YouTube channel
-    ///
-    /// This function does not return channel metadata.
-    pub async fn channel_videos_tab_order<S: AsRef<str>>(
+    /// Get the livestreams from a YouTube channel
+    pub async fn channel_livestreams<S: AsRef<str>>(
        &self,
        channel_id: S,
-        tab: ChannelVideoTab,
-        order: ChannelOrder,
-    ) -> Result<Paginator<VideoItem>, Error> {
-        let visitor_data = match tab {
-            ChannelVideoTab::Shorts => Some(self.get_visitor_data().await?),
-            _ => None,
-        };
-
-        self.continuation(
-            order_ctoken(channel_id.as_ref(), tab, order),
-            ContinuationEndpoint::Browse,
-            visitor_data.as_deref(),
-        )
-        .await
+    ) -> Result<Channel<Paginator<VideoItem>>, Error> {
+        self._channel_videos(channel_id, Params::Live, None, "channel_livestreams")
+            .await
    }

    /// Search the videos of a channel
@ -138,7 +101,7 @@ impl RustyPipeQuery {
    ) -> Result<Channel<Paginator<VideoItem>>, Error> {
        self._channel_videos(
            channel_id,
-            ChannelTab::Search,
+            Params::Search,
            Some(query.as_ref()),
            "channel_search",
        )
@ -155,7 +118,7 @@ impl RustyPipeQuery {
        let request_body = QChannel {
            context,
            browse_id: channel_id,
-            params: ChannelTab::Playlists,
+            params: Params::Playlists,
            query: None,
        };

@ -179,7 +142,7 @@ impl RustyPipeQuery {
        let request_body = QChannel {
            context,
            browse_id: channel_id,
-            params: ChannelTab::Info,
+            params: Params::Info,
            query: None,
        };

@ -488,16 +451,16 @@ fn map_channel_content(
                    .or(tab.tab_renderer.content.section_list_renderer)
            });

-            // YouTube may show the "Featured" tab if the requested tab is empty/does not exist
-            let content = if featured_tab {
-                MapResult::default()
-            } else {
-                match channel_content {
-                    Some(list) => list.contents,
-                    None => {
-                        return Err(ExtractionError::InvalidData(
-                            "could not extract content".into(),
-                        ))
+            let content = match channel_content {
+                Some(list) => list.contents,
+                None => {
+                    // YouTube may show the "Featured" tab if the requested tab is empty/does not exist
+                    if featured_tab {
+                        MapResult::default()
+                    } else {
+                        return Err(ExtractionError::InvalidData(Cow::Borrowed(
+                            "could not extract content",
+                        )));
                    }
                }
            };
@ -532,47 +495,6 @@ fn combine_channel_data<T>(channel_data: Channel<()>, content: T) -> Channel<T>
    }
 }

-/// Get the continuation token to fetch channel videos in the given order
-fn order_ctoken(channel_id: &str, tab: ChannelVideoTab, order: ChannelOrder) -> String {
-    _order_ctoken(
-        channel_id,
-        tab,
-        order,
-        &format!("\n${}", util::random_uuid()),
-    )
-}
-
-/// Get the continuation token to fetch channel videos in the given order
-/// (fixed targetId for testing)
-fn _order_ctoken(
-    channel_id: &str,
-    tab: ChannelVideoTab,
-    order: ChannelOrder,
-    target_id: &str,
-) -> String {
-    let mut pb_tab = ProtoBuilder::new();
-    pb_tab.string(2, target_id);
-    pb_tab.varint(3, order as u64);
-
-    let mut pb_3 = ProtoBuilder::new();
-    pb_3.embedded(tab.order_ctoken_id(), pb_tab);
-
-    let mut pb_110 = ProtoBuilder::new();
-    pb_110.embedded(3, pb_3);
-
-    let mut pbi = ProtoBuilder::new();
-    pbi.embedded(110, pb_110);
-
-    let mut pb_80226972 = ProtoBuilder::new();
-    pb_80226972.string(2, channel_id);
-    pb_80226972.string(3, &pbi.to_base64());
-
-    let mut pb = ProtoBuilder::new();
-    pb.embedded(80226972, pb_80226972);
-
-    pb.to_base64()
-}
-
 #[cfg(test)]
 mod tests {
    use std::{fs::File, io::BufReader};
@ -583,13 +505,11 @@ mod tests {
    use crate::{
        client::{response, MapResponse},
        model::{paginator::Paginator, Channel, ChannelInfo, PlaylistItem, VideoItem},
-        param::{ChannelOrder, ChannelVideoTab, Language},
+        param::Language,
        serializer::MapResult,
        util::tests::TESTFILES,
    };

-    use super::_order_ctoken;
-
    #[rstest]
    #[case::base("videos_base", "UC2DjFE7Xf11URZqWBigcVOQ")]
    #[case::music("videos_music", "UC_vmjW5e1xEHhYjY2a0kK1A")]
@ -665,33 +585,4 @@ mod tests {
        );
        insta::assert_ron_snapshot!("map_channel_info", map_res.c);
    }
-
-    #[test]
-    fn order_ctoken() {
-        let channel_id = "UCXuqSBlHAE6Xw-yeJA0Tunw";
-
-        let videos_popular_token = _order_ctoken(
-            channel_id,
-            ChannelVideoTab::Videos,
-            ChannelOrder::Popular,
-            "\n$6461d7c8-0000-2040-87aa-089e0827e420",
-        );
-        assert_eq!(videos_popular_token, "4qmFsgJkEhhVQ1h1cVNCbEhBRTZYdy15ZUpBMFR1bncaSDhnWXVHaXg2S2hJbUNpUTJORFl4WkRkak9DMHdNREF3TFRJd05EQXRPRGRoWVMwd09EbGxNRGd5TjJVME1qQVlBZyUzRCUzRA%3D%3D");
-
-        let shorts_popular_token = _order_ctoken(
-            channel_id,
-            ChannelVideoTab::Shorts,
-            ChannelOrder::Popular,
-            "\n$64679ffb-0000-26b3-a1bd-582429d2c794",
-        );
-        assert_eq!(shorts_popular_token, "4qmFsgJkEhhVQ1h1cVNCbEhBRTZYdy15ZUpBMFR1bncaSDhnWXVHaXhTS2hJbUNpUTJORFkzT1dabVlpMHdNREF3TFRJMllqTXRZVEZpWkMwMU9ESTBNamxrTW1NM09UUVlBZyUzRCUzRA%3D%3D");
-
-        let live_popular_token = _order_ctoken(
-            channel_id,
-            ChannelVideoTab::Live,
-            ChannelOrder::Popular,
-            "\n$64693069-0000-2a1e-8c7d-582429bd5ba8",
-        );
-        assert_eq!(live_popular_token, "4qmFsgJkEhhVQ1h1cVNCbEhBRTZYdy15ZUpBMFR1bncaSDhnWXVHaXh5S2hJbUNpUTJORFk1TXpBMk9TMHdNREF3TFRKaE1XVXRPR00zWkMwMU9ESTBNamxpWkRWaVlUZ1lBZyUzRCUzRA%3D%3D");
-    }
 }
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@ -191,7 +191,6 @@ const CONSENT_COOKIE_YES: &str = "YES+yt.462272069.de+FX+";
 const YOUTUBEI_V1_URL: &str = "https://www.youtube.com/youtubei/v1/";
 const YOUTUBEI_V1_GAPIS_URL: &str = "https://youtubei.googleapis.com/youtubei/v1/";
 const YOUTUBE_MUSIC_V1_URL: &str = "https://music.youtube.com/youtubei/v1/";
-const YOUTUBE_HOME_URL: &str = "https://www.youtube.com/";
 const YOUTUBE_MUSIC_HOME_URL: &str = "https://music.youtube.com/";

 const DISABLE_PRETTY_PRINT_PARAMETER: &str = "&prettyPrint=false";
@ -390,17 +389,21 @@ impl RustyPipeBuilder {
            Box::new(FileStorage::new(cache_file))
        });

-        let cdata = storage
-            .as_ref()
-            .and_then(|storage| storage.read())
-            .and_then(|data| match serde_json::from_str::<CacheData>(&data) {
-                Ok(data) => Some(data),
-                Err(e) => {
-                    log::error!("Could not deserialize cache. Error: {}", e);
-                    None
+        let cdata = if let Some(storage) = &storage {
+            if let Some(data) = storage.read() {
+                match serde_json::from_str::<CacheData>(&data) {
+                    Ok(data) => data,
+                    Err(e) => {
+                        log::error!("Could not deserialize cache. Error: {}", e);
+                        CacheData::default()
+                    }
                }
-            })
-            .unwrap_or_default();
+            } else {
+                CacheData::default()
+            }
+        } else {
+            CacheData::default()
+        };

        RustyPipe {
            inner: Arc::new(RustyPipeRef {
@ -645,7 +648,7 @@ impl RustyPipe {
        self.extract_client_version(
            Some("https://www.youtube.com/sw.js"),
            "https://www.youtube.com/results?search_query=",
-            YOUTUBE_HOME_URL,
+            "https://www.youtube.com",
            None,
        )
        .await
@ -655,8 +658,8 @@ impl RustyPipe {
    async fn extract_music_client_version(&self) -> Result<String, Error> {
        self.extract_client_version(
            Some("https://music.youtube.com/sw.js"),
-            YOUTUBE_MUSIC_HOME_URL,
-            YOUTUBE_MUSIC_HOME_URL,
+            "https://music.youtube.com",
+            "https://music.youtube.com",
            None,
        )
        .await
@ -813,7 +816,7 @@ impl RustyPipe {
        }
    }

-    async fn get_visitor_data(&self) -> Result<String, Error> {
+    async fn get_ytm_visitor_data(&self) -> Result<String, Error> {
        log::debug!("getting YTM visitor data");
        let resp = self.inner.http.get(YOUTUBE_MUSIC_HOME_URL).send().await?;

@ -904,7 +907,7 @@ impl RustyPipeQuery {
                    client_name: "WEB",
                    client_version: Cow::Owned(self.client.get_desktop_client_version().await),
                    platform: "DESKTOP",
-                    original_url: Some(YOUTUBE_HOME_URL),
+                    original_url: Some("https://www.youtube.com/"),
                    visitor_data,
                    hl,
                    gl,
@ -919,7 +922,7 @@ impl RustyPipeQuery {
                    client_name: "WEB_REMIX",
                    client_version: Cow::Owned(self.client.get_music_client_version().await),
                    platform: "DESKTOP",
-                    original_url: Some(YOUTUBE_MUSIC_HOME_URL),
+                    original_url: Some("https://music.youtube.com/"),
                    visitor_data,
                    hl,
                    gl,
@ -943,7 +946,7 @@ impl RustyPipeQuery {
                request: Some(RequestYT::default()),
                user: User::default(),
                third_party: Some(ThirdParty {
-                    embed_url: YOUTUBE_HOME_URL,
+                    embed_url: "https://www.youtube.com/",
                }),
            },
            ClientType::Android => YTContext {
@ -994,8 +997,8 @@ impl RustyPipeQuery {
                .post(format!(
                    "{YOUTUBEI_V1_URL}{endpoint}?key={DESKTOP_API_KEY}{DISABLE_PRETTY_PRINT_PARAMETER}"
                ))
-                .header(header::ORIGIN, YOUTUBE_HOME_URL)
-                .header(header::REFERER, YOUTUBE_HOME_URL)
+                .header(header::ORIGIN, "https://www.youtube.com")
+                .header(header::REFERER, "https://www.youtube.com")
                .header(header::COOKIE, self.client.inner.consent_cookie.to_owned())
                .header("X-YouTube-Client-Name", "1")
                .header(
@ -1009,8 +1012,8 @@ impl RustyPipeQuery {
                .post(format!(
                    "{YOUTUBE_MUSIC_V1_URL}{endpoint}?key={DESKTOP_MUSIC_API_KEY}{DISABLE_PRETTY_PRINT_PARAMETER}"
                ))
-                .header(header::ORIGIN, YOUTUBE_MUSIC_HOME_URL)
-                .header(header::REFERER, YOUTUBE_MUSIC_HOME_URL)
+                .header(header::ORIGIN, "https://music.youtube.com")
+                .header(header::REFERER, "https://music.youtube.com")
                .header(header::COOKIE, self.client.inner.consent_cookie.to_owned())
                .header("X-YouTube-Client-Name", "67")
                .header(
@ -1024,8 +1027,8 @@ impl RustyPipeQuery {
                .post(format!(
                    "{YOUTUBEI_V1_URL}{endpoint}?key={DESKTOP_API_KEY}{DISABLE_PRETTY_PRINT_PARAMETER}"
                ))
-                .header(header::ORIGIN, YOUTUBE_HOME_URL)
-                .header(header::REFERER, YOUTUBE_HOME_URL)
+                .header(header::ORIGIN, "https://www.youtube.com")
+                .header(header::REFERER, "https://www.youtube.com")
                .header("X-YouTube-Client-Name", "1")
                .header("X-YouTube-Client-Version", TVHTML5_CLIENT_VERSION),
            ClientType::Android => self
@ -1061,11 +1064,11 @@ impl RustyPipeQuery {
        }
    }

-    /// Get a YouTube visitor data cookie, which is necessary for certain requests
-    async fn get_visitor_data(&self) -> Result<String, Error> {
+    /// Get a YouTube Music visitor data cookie, which is necessary for certain requests
+    async fn get_ytm_visitor_data(&self) -> Result<String, Error> {
        match &self.opts.visitor_data {
            Some(vd) => Ok(vd.to_owned()),
-            None => self.client.get_visitor_data().await,
+            None => self.client.get_ytm_visitor_data().await,
        }
    }

@ -1305,9 +1308,9 @@ mod tests {
    }

    #[test]
-    fn t_get_visitor_data() {
+    fn t_get_ytm_visitor_data() {
        let rp = RustyPipe::new();
-        let visitor_data = tokio_test::block_on(rp.get_visitor_data()).unwrap();
+        let visitor_data = tokio_test::block_on(rp.get_ytm_visitor_data()).unwrap();
        assert!(visitor_data.ends_with("%3D"));
        assert_eq!(visitor_data.len(), 32)
    }
--- a/src/client/music_artist.rs
+++ b/src/client/music_artist.rs
@ -27,7 +27,7 @@ impl RustyPipeQuery {
    ) -> Result<MusicArtist, Error> {
        let artist_id = artist_id.as_ref();
        let visitor_data = match all_albums {
-            true => Some(self.get_visitor_data().await?),
+            true => Some(self.get_ytm_visitor_data().await?),
            false => None,
        };

--- a/src/client/music_details.rs
+++ b/src/client/music_details.rs
@ -109,7 +109,7 @@ impl RustyPipeQuery {
        radio_id: S,
    ) -> Result<Paginator<TrackItem>, Error> {
        let radio_id = radio_id.as_ref();
-        let visitor_data = self.get_visitor_data().await?;
+        let visitor_data = self.get_ytm_visitor_data().await?;
        let context = self
            .get_context(ClientType::DesktopMusic, true, Some(&visitor_data))
            .await;
--- a/src/client/pagination.rs
+++ b/src/client/pagination.rs
@ -102,12 +102,8 @@ impl MapResponse<Paginator<YouTubeItem>> for response::Continuation {
            .and_then(|actions| {
                actions
                    .into_iter()
+                    .next()
                    .map(|action| action.append_continuation_items_action.continuation_items)
-                    .reduce(|mut acc, mut items| {
-                        acc.c.append(&mut items.c);
-                        acc.warnings.append(&mut items.warnings);
-                        acc
-                    })
            })
            .or_else(|| {
                self.continuation_contents
--- a/src/client/player.rs
+++ b/src/client/player.rs
@ -12,8 +12,8 @@ use crate::{
    deobfuscate::Deobfuscator,
    error::{internal::DeobfError, Error, ExtractionError, UnavailabilityReason},
    model::{
-        traits::QualityOrd, AudioCodec, AudioFormat, AudioStream, AudioTrack, ChannelId, Frameset,
-        Subtitle, VideoCodec, VideoFormat, VideoPlayer, VideoPlayerDetails, VideoStream,
+        traits::QualityOrd, AudioCodec, AudioFormat, AudioStream, AudioTrack, ChannelId, Subtitle,
+        VideoCodec, VideoFormat, VideoPlayer, VideoPlayerDetails, VideoStream,
    },
    param::Language,
    util,
@ -313,54 +313,6 @@ impl MapResponse<VideoPlayer> for response::Player {
                .collect()
        });

-        let preview_frames = self
-            .storyboards
-            .and_then(|sb| {
-                let spec = sb.player_storyboard_spec_renderer.spec;
-                let mut spec_parts = spec.split('|');
-                let url_tmpl = spec_parts.next()?;
-
-                Some(
-                    spec_parts
-                        .enumerate()
-                        .filter_map(|(i, fs_spec)| {
-                            // Example: 160#90#131#5#5#2000#M$M#rs$AOn4CLCV3TJ2Nty5fbw2r-Lqg4VDOZcVvQ
-                            let mut parts = fs_spec.split('#');
-
-                            let frame_width = parts.next()?.parse().ok()?;
-                            let frame_height = parts.next()?.parse().ok()?;
-                            let total_count = parts.next()?.parse().ok()?;
-                            let frames_per_page_x = parts.next()?.parse().ok()?;
-                            let frames_per_page_y = parts.next()?.parse().ok()?;
-                            let duration_per_frame = parts.next()?.parse().ok()?;
-
-                            let n = parts.next()?;
-                            let sigh = parts.next()?;
-
-                            let url = url_tmpl.replace("$L", &i.to_string()).replace("$N", n)
-                                + "&sigh="
-                                + sigh;
-
-                            let sprite_count = ((total_count as f64)
-                                / (frames_per_page_x * frames_per_page_y) as f64)
-                                .ceil() as u32;
-
-                            Some(Frameset {
-                                url_template: url,
-                                frame_width,
-                                frame_height,
-                                page_count: sprite_count,
-                                total_count,
-                                duration_per_frame,
-                                frames_per_page_x,
-                                frames_per_page_y,
-                            })
-                        })
-                        .collect(),
-                )
-            })
-            .unwrap_or_default();
-
        Ok(MapResult {
            c: VideoPlayer {
                details: video_info,
@ -371,7 +323,6 @@ impl MapResponse<VideoPlayer> for response::Player {
                expires_in_seconds: streaming_data.expires_in_seconds,
                hls_manifest_url: streaming_data.hls_manifest_url,
                dash_manifest_url: streaming_data.dash_manifest_url,
-                preview_frames,
                visitor_data: self.response_context.visitor_data,
            },
            warnings,
@ -426,18 +377,12 @@ fn deobf_nsig(
    Ok(())
 }

-struct UrlMapRes {
-    url: String,
-    throttled: bool,
-    xtags: Option<String>,
-}
-
 fn map_url(
    url: &Option<String>,
    signature_cipher: &Option<String>,
    deobf: &Deobfuscator,
    last_nsig: &mut [String; 2],
-) -> MapResult<Option<UrlMapRes>> {
+) -> MapResult<Option<(String, bool)>> {
    let x = match url {
        Some(url) => util::url_to_params(url).map_err(|_| format!("Could not parse url `{url}`")),
        None => match signature_cipher {
@ -469,11 +414,7 @@ fn map_url(

    match Url::parse_with_params(url_base.as_str(), url_params.iter()) {
        Ok(url) => MapResult {
-            c: Some(UrlMapRes {
-                url: url.to_string(),
-                throttled,
-                xtags: url_params.get("xtags").cloned(),
-            }),
+            c: Some((url.to_string(), throttled)),
            warnings,
        },
        Err(_) => MapResult {
@ -514,9 +455,9 @@ fn map_video_stream(
    let map_res = map_url(&f.url, &f.signature_cipher, deobf, last_nsig);

    match map_res.c {
-        Some(url) => MapResult {
+        Some((url, throttled)) => MapResult {
            c: Some(VideoStream {
-                url: url.url,
+                url,
                itag: f.itag,
                bitrate: f.bitrate,
                average_bitrate: f.average_bitrate.unwrap_or(f.bitrate),
@ -535,7 +476,7 @@ fn map_video_stream(
                mime: f.mime_type.to_owned(),
                format,
                codec: get_video_codec(codecs),
-                throttled: url.throttled,
+                throttled,
            }),
            warnings: map_res.warnings,
        },
@ -551,6 +492,8 @@ fn map_audio_stream(
    deobf: &Deobfuscator,
    last_nsig: &mut [String; 2],
 ) -> MapResult<Option<AudioStream>> {
+    static LANG_PATTERN: Lazy<Regex> = Lazy::new(|| Regex::new(r#"^([a-z]{2,3})\."#).unwrap());
+
    let (mtype, codecs) = match parse_mime(&f.mime_type) {
        Some(x) => x,
        None => {
@ -573,12 +516,11 @@ fn map_audio_stream(
        }
    };
    let map_res = map_url(&f.url, &f.signature_cipher, deobf, last_nsig);
-    let mut warnings = map_res.warnings;

    match map_res.c {
-        Some(url) => MapResult {
+        Some((url, throttled)) => MapResult {
            c: Some(AudioStream {
-                url: url.url,
+                url,
                itag: f.itag,
                bitrate: f.bitrate,
                average_bitrate: f.average_bitrate.unwrap_or(f.bitrate),
@ -591,14 +533,29 @@ fn map_audio_stream(
                codec: get_audio_codec(codecs),
                channels: f.audio_channels,
                loudness_db: f.loudness_db,
-                throttled: url.throttled,
-                track: f
-                    .audio_track
-                    .map(|t| map_audio_track(t, url.xtags, &mut warnings)),
+                throttled,
+                track: match f.audio_track {
+                    Some(t) => {
+                        let lang = LANG_PATTERN
+                            .captures(&t.id)
+                            .map(|m| m.get(1).unwrap().as_str().to_owned());
+
+                        Some(AudioTrack {
+                            id: t.id,
+                            lang,
+                            lang_name: t.display_name,
+                            is_default: t.audio_is_default,
+                        })
+                    }
+                    None => None,
+                },
            }),
-            warnings,
+            warnings: map_res.warnings,
+        },
+        None => MapResult {
+            c: None,
+            warnings: map_res.warnings,
        },
-        None => MapResult { c: None, warnings },
    }
 }

@ -661,43 +618,6 @@ fn get_audio_codec(codecs: Vec<&str>) -> AudioCodec {
    AudioCodec::Unknown
 }

-fn map_audio_track(
-    track: response::player::AudioTrack,
-    xtags: Option<String>,
-    warnings: &mut Vec<String>,
-) -> AudioTrack {
-    let mut lang = None;
-    let mut track_type = None;
-
-    if let Some(xtags) = xtags {
-        xtags
-            .split(':')
-            .filter_map(|param| param.split_once('='))
-            .for_each(|(k, v)| match k {
-                "lang" => {
-                    lang = Some(v.to_owned());
-                }
-                "acont" => match serde_plain::from_str(v) {
-                    Ok(v) => {
-                        track_type = Some(v);
-                    }
-                    Err(_) => {
-                        warnings.push(format!("could not parse audio track type `{v}`"));
-                    }
-                },
-                _ => {}
-            })
-    }
-
-    AudioTrack {
-        id: track.id,
-        lang,
-        lang_name: track.display_name,
-        is_default: track.audio_is_default,
-        track_type,
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use std::{fs::File, io::BufReader};
@ -762,10 +682,10 @@ mod tests {
            &deobf,
            &mut last_nsig,
        );
-        let url = map_res.c.unwrap();
+        let (url, throttled) = map_res.c.unwrap();

-        assert_eq!(url.url, "https://rr5---sn-h0jelnez.googlevideo.com/videoplayback?c=WEB&clen=3781277&dur=229.301&ei=vb7nYvH5BMK8gAfBj7ToBQ&expire=1659376413&fexp=24001373%2C24007246&fvip=5&gir=yes&id=o-AB_BABwrXZJN428ZwDxq5ScPn2AbcGODnRlTVhCQ3mj2&initcwndbps=1588750&ip=2003%3Ade%3Aaf06%3A6300%3Ac750%3A1b77%3Ac74a%3A80e3&itag=251&keepalive=yes&lmt=1655510291473933&lsig=AG3C_xAwRQIgCKCGJ1iu4wlaGXy3jcJyU3inh9dr1FIfqYOZEG_MdmACIQCbungkQYFk7EhD6K2YvLaHFMjKOFWjw001_tLb0lPDtg%3D%3D&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=hH&mime=audio%2Fwebm&mm=31%2C26&mn=sn-h0jelnez%2Csn-4g5ednsl&ms=au%2Conr&mt=1659354538&mv=m&mvi=5&n=XzXGSfGusw6OCQ&ns=b_Mq_qlTFcSGlG9RpwpM9xQH&pl=37&rbqsm=fr&requiressl=yes&sig=AOq0QJ8wRQIhAPIsKd7-xi4xVHEC9gb__dU4hzfzsHEj9ytd3nt0gEceAiACJWBcw-wFEq9qir35bwKHJZxtQ9mOL7SKiVkLQNDa6A%3D%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=lT-Khi831z8dTejFIRCvCEwx_6romtM&txp=4532434&vprv=1");
-        assert!(!url.throttled);
+        assert_eq!(url, "https://rr5---sn-h0jelnez.googlevideo.com/videoplayback?c=WEB&clen=3781277&dur=229.301&ei=vb7nYvH5BMK8gAfBj7ToBQ&expire=1659376413&fexp=24001373%2C24007246&fvip=5&gir=yes&id=o-AB_BABwrXZJN428ZwDxq5ScPn2AbcGODnRlTVhCQ3mj2&initcwndbps=1588750&ip=2003%3Ade%3Aaf06%3A6300%3Ac750%3A1b77%3Ac74a%3A80e3&itag=251&keepalive=yes&lmt=1655510291473933&lsig=AG3C_xAwRQIgCKCGJ1iu4wlaGXy3jcJyU3inh9dr1FIfqYOZEG_MdmACIQCbungkQYFk7EhD6K2YvLaHFMjKOFWjw001_tLb0lPDtg%3D%3D&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=hH&mime=audio%2Fwebm&mm=31%2C26&mn=sn-h0jelnez%2Csn-4g5ednsl&ms=au%2Conr&mt=1659354538&mv=m&mvi=5&n=XzXGSfGusw6OCQ&ns=b_Mq_qlTFcSGlG9RpwpM9xQH&pl=37&rbqsm=fr&requiressl=yes&sig=AOq0QJ8wRQIhAPIsKd7-xi4xVHEC9gb__dU4hzfzsHEj9ytd3nt0gEceAiACJWBcw-wFEq9qir35bwKHJZxtQ9mOL7SKiVkLQNDa6A%3D%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=lT-Khi831z8dTejFIRCvCEwx_6romtM&txp=4532434&vprv=1");
+        assert!(!throttled);
        assert!(
            map_res.warnings.is_empty(),
            "deserialization/mapping warnings: {:?}",
--- a/src/client/response/mod.rs
+++ b/src/client/response/mod.rs
@ -219,7 +219,6 @@ pub(crate) struct Continuation {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct ContinuationActionWrap {
-    #[serde(alias = "reloadContinuationItemsCommand")]
    pub append_continuation_items_action: ContinuationAction,
 }

--- a/src/client/response/player.rs
+++ b/src/client/response/player.rs
@ -7,7 +7,6 @@ use serde_with::{json::JsonString, DefaultOnError};
 use super::{ResponseContext, Thumbnails};
 use crate::serializer::{text::Text, MapResult};

-#[serde_as]
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct Player {
@ -15,9 +14,6 @@ pub(crate) struct Player {
    pub streaming_data: Option<StreamingData>,
    pub captions: Option<Captions>,
    pub video_details: Option<VideoDetails>,
-    #[serde(default)]
-    #[serde_as(deserialize_as = "DefaultOnError")]
-    pub storyboards: Option<Storyboards>,
    pub response_context: ResponseContext,
 }

@ -250,15 +246,3 @@ pub(crate) struct VideoDetails {
    pub author: String,
    pub is_live_content: bool,
 }
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct Storyboards {
-    pub player_storyboard_spec_renderer: StoryboardRenderer,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct StoryboardRenderer {
-    pub spec: String,
-}
--- a/src/client/response/video_item.rs
+++ b/src/client/response/video_item.rs
@ -1,3 +1,5 @@
+use once_cell::sync::Lazy;
+use regex::Regex;
 use serde::Deserialize;
 use serde_with::{
    json::JsonString, rust::deserialize_ignore_any, serde_as, DefaultOnError, VecSkipError,
@ -428,17 +430,11 @@ impl<T> YouTubeListMapper<T> {
    }

    fn map_video(&mut self, video: VideoRenderer) -> VideoItem {
-        let is_live = video.thumbnail_overlays.is_live() || video.badges.is_live();
-        let is_short = video.thumbnail_overlays.is_short();
-
+        let mut tn_overlays = video.thumbnail_overlays;
        let length_text = video.length_text.or_else(|| {
-            video
-                .thumbnail_overlays
-                .into_iter()
-                .find(|ol| {
-                    ol.thumbnail_overlay_time_status_renderer.style == TimeOverlayStyle::Default
-                })
-                .map(|ol| ol.thumbnail_overlay_time_status_renderer.text)
+            tn_overlays
+                .try_swap_remove(0)
+                .map(|overlay| overlay.thumbnail_overlay_time_status_renderer.text)
        });

        VideoItem {
@ -476,8 +472,8 @@ impl<T> YouTubeListMapper<T> {
            view_count: video
                .view_count_text
                .map(|txt| util::parse_numeric(&txt).unwrap_or_default()),
-            is_live,
-            is_short,
+            is_live: tn_overlays.is_live() || video.badges.is_live(),
+            is_short: tn_overlays.is_short(),
            is_upcoming: video.upcoming_event_data.is_some(),
            short_description: video
                .detailed_metadata_snippets
@ -487,6 +483,9 @@ impl<T> YouTubeListMapper<T> {
    }

    fn map_short_video(&mut self, video: ReelItemRenderer, lang: Language) -> VideoItem {
+        static ACCESSIBILITY_SEP_REGEX: Lazy<Regex> =
+            Lazy::new(|| Regex::new(" [-\u{2013}] ").unwrap());
+
        let pub_date_txt = video.navigation_endpoint.map(|n| {
            n.reel_watch_endpoint
                .overlay
@ -500,7 +499,7 @@ impl<T> YouTubeListMapper<T> {
            id: video.video_id,
            name: video.headline,
            length: video.accessibility.and_then(|acc| {
-                acc.rsplit(" - ").nth(1).and_then(|s| {
+                ACCESSIBILITY_SEP_REGEX.split(&acc).nth(1).and_then(|s| {
                    timeago::parse_video_duration_or_warn(self.lang, s, &mut self.warnings)
                })
            }),
--- a/src/client/snapshots/rustypipeclientchanneltestsmap_channel_videos_live.snap
+++ b/src/client/snapshots/rustypipeclientchanneltestsmap_channel_videos_live.snap
@ -168,7 +168,7 @@ Channel(
        publish_date: "[date]",
        publish_date_txt: None,
        view_count: Some(94),
-        is_live: true,
+        is_live: false,
        is_short: false,
        is_upcoming: false,
        short_description: None,
@ -209,7 +209,7 @@ Channel(
        publish_date: "[date]",
        publish_date_txt: None,
        view_count: Some(381),
-        is_live: true,
+        is_live: false,
        is_short: false,
        is_upcoming: false,
        short_description: None,
@ -414,7 +414,7 @@ Channel(
        publish_date: "[date]",
        publish_date_txt: None,
        view_count: Some(2043),
-        is_live: true,
+        is_live: false,
        is_short: false,
        is_upcoming: false,
        short_description: None,
@ -783,7 +783,7 @@ Channel(
        publish_date: "[date]",
        publish_date_txt: None,
        view_count: Some(4030),
-        is_live: true,
+        is_live: false,
        is_short: false,
        is_upcoming: false,
        short_description: None,
--- a/src/client/snapshots/rustypipeclientchanneltestsmap_channel_videos_shorts.snap
+++ b/src/client/snapshots/rustypipeclientchanneltestsmap_channel_videos_shorts.snap
@ -141,7 +141,7 @@ Channel(
        publish_date_txt: Some("1 day ago"),
        view_count: Some(443549),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -167,7 +167,7 @@ Channel(
        publish_date_txt: Some("2 days ago"),
        view_count: Some(1154962),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -234,7 +234,7 @@ Channel(
        publish_date_txt: Some("6 days ago"),
        view_count: Some(1388173),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -260,7 +260,7 @@ Channel(
        publish_date_txt: Some("7 days ago"),
        view_count: Some(1738301),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -286,7 +286,7 @@ Channel(
        publish_date_txt: Some("9 days ago"),
        view_count: Some(1316594),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -353,7 +353,7 @@ Channel(
        publish_date_txt: Some("11 days ago"),
        view_count: Some(1412213),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -379,7 +379,7 @@ Channel(
        publish_date_txt: Some("13 days ago"),
        view_count: Some(1513305),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -405,7 +405,7 @@ Channel(
        publish_date_txt: Some("2 weeks ago"),
        view_count: Some(8936223),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -472,7 +472,7 @@ Channel(
        publish_date_txt: Some("2 weeks ago"),
        view_count: Some(2769717),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -539,7 +539,7 @@ Channel(
        publish_date_txt: Some("3 weeks ago"),
        view_count: Some(572107),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -565,7 +565,7 @@ Channel(
        publish_date_txt: Some("3 weeks ago"),
        view_count: Some(1707132),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -591,7 +591,7 @@ Channel(
        publish_date_txt: Some("3 weeks ago"),
        view_count: Some(933094),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -617,7 +617,7 @@ Channel(
        publish_date_txt: Some("1 month ago"),
        view_count: Some(5985184),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -643,7 +643,7 @@ Channel(
        publish_date_txt: Some("1 month ago"),
        view_count: Some(14741387),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -669,7 +669,7 @@ Channel(
        publish_date_txt: Some("1 month ago"),
        view_count: Some(2511322),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -695,7 +695,7 @@ Channel(
        publish_date_txt: Some("1 month ago"),
        view_count: Some(2364408),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -762,7 +762,7 @@ Channel(
        publish_date_txt: Some("1 month ago"),
        view_count: Some(1947627),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -788,7 +788,7 @@ Channel(
        publish_date_txt: Some("1 month ago"),
        view_count: Some(4763839),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -814,7 +814,7 @@ Channel(
        publish_date_txt: Some("1 month ago"),
        view_count: Some(1915695),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -840,7 +840,7 @@ Channel(
        publish_date_txt: Some("1 month ago"),
        view_count: Some(7268944),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -866,7 +866,7 @@ Channel(
        publish_date_txt: Some("1 month ago"),
        view_count: Some(2539103),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -892,7 +892,7 @@ Channel(
        publish_date_txt: Some("2 months ago"),
        view_count: Some(5545680),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -918,7 +918,7 @@ Channel(
        publish_date_txt: Some("2 months ago"),
        view_count: Some(2202314),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
@ -985,7 +985,7 @@ Channel(
        publish_date_txt: Some("2 months ago"),
        view_count: Some(6443699),
        is_live: false,
-        is_short: true,
+        is_short: false,
        is_upcoming: false,
        short_description: None,
      ),
--- a/src/client/snapshots/rustypipeclientplayertestsmap_player_data_android.snap
+++ b/src/client/snapshots/rustypipeclientplayertestsmap_player_data_android.snap
@ -450,37 +450,5 @@ VideoPlayer(
  expires_in_seconds: 21540,
  hls_manifest_url: None,
  dash_manifest_url: Some("https://manifest.googlevideo.com/api/manifest/dash/expire/1659481355/ei/q1jpYtOPEYSBgQeHmqbwAQ/ip/2003%3Ade%3Aaf0e%3A2f00%3Ade47%3A297%3Aa6db%3A774e/id/a4fbddf14c6649b4/source/youtube/requiressl/yes/playback_host/rr5---sn-h0jeenek.googlevideo.com/mh/mQ/mm/31%2C29/mn/sn-h0jeenek%2Csn-h0jelnez/ms/au%2Crdu/mv/m/mvi/5/pl/37/hfr/1/as/fmp4_audio_clear%2Cfmp4_sd_hd_clear/initcwndbps/1527500/vprv/1/mt/1659459429/fvip/4/itag_bl/376%2C377%2C384%2C385%2C612%2C613%2C617%2C619%2C623%2C628%2C655%2C656%2C660%2C662%2C666%2C671/keepalive/yes/fexp/24001373%2C24007246/itag/0/sparams/expire%2Cei%2Cip%2Cid%2Csource%2Crequiressl%2Chfr%2Cas%2Cvprv%2Citag/sig/AOq0QJ8wRAIgMm4a_MIHA3YUszKeruSy3exs5JwNjJAyLAwxL0yPdNMCIANb9GDMSTp_NT-PPhbvYMwRULJ5a9BO6MYD9FuWprC1/lsparams/playback_host%2Cmh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps/lsig/AG3C_xAwRQIgETSOwhwWVMy7gmrFXZlJu655ToLzSwOEsT16oRyrWhACIQDkvOEw1fImz5omu4iVIRNFe-z-JC9v8WUyx281dW2NOw%3D%3D"),
-  preview_frames: [
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L0/default.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLAXobPyrylgm8IEvjlZzqYTiPe1Ow",
-      frame_width: 48,
-      frame_height: 27,
-      page_count: 1,
-      total_count: 100,
-      duration_per_frame: 0,
-      frames_per_page_x: 10,
-      frames_per_page_y: 10,
-    ),
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L1/M$M.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLCWd3ylPF7ViQFBu5RUODMcusr_5g",
-      frame_width: 80,
-      frame_height: 45,
-      page_count: 1,
-      total_count: 83,
-      duration_per_frame: 2000,
-      frames_per_page_x: 10,
-      frames_per_page_y: 10,
-    ),
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L2/M$M.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLA6xat5cfw0e3EX_5SW-TPwkmExxA",
-      frame_width: 160,
-      frame_height: 90,
-      page_count: 4,
-      total_count: 83,
-      duration_per_frame: 2000,
-      frames_per_page_x: 5,
-      frames_per_page_y: 5,
-    ),
-  ],
  visitor_data: Some("Cgt2aHFtQU5YZFBvYyirsaWXBg%3D%3D"),
 )
--- a/src/client/snapshots/rustypipeclientplayertestsmap_player_data_desktop.snap
+++ b/src/client/snapshots/rustypipeclientplayertestsmap_player_data_desktop.snap
@ -569,37 +569,5 @@ VideoPlayer(
  expires_in_seconds: 21540,
  hls_manifest_url: None,
  dash_manifest_url: Some("https://manifest.googlevideo.com/api/manifest/dash/expire/1659481355/ei/q1jpYtq3BJCX1gKVyJGQDg/ip/2003%3Ade%3Aaf0e%3A2f00%3Ade47%3A297%3Aa6db%3A774e/id/a4fbddf14c6649b4/source/youtube/requiressl/yes/playback_host/rr4---sn-h0jelnez.googlevideo.com/mh/mQ/mm/31%2C26/mn/sn-h0jelnez%2Csn-4g5edn6k/ms/au%2Conr/mv/m/mvi/4/pl/37/hfr/all/as/fmp4_audio_clear%2Cwebm_audio_clear%2Cwebm2_audio_clear%2Cfmp4_sd_hd_clear%2Cwebm2_sd_hd_clear/initcwndbps/1513750/spc/lT-KhrZGE2opztWyVdAtyUNlb8dXPDs/vprv/1/mt/1659459429/fvip/4/keepalive/yes/fexp/24001373%2C24007246/itag/0/sparams/expire%2Cei%2Cip%2Cid%2Csource%2Crequiressl%2Chfr%2Cas%2Cspc%2Cvprv%2Citag/sig/AOq0QJ8wRgIhAPEjHK19PKVHqQeia6WF4qubuMYk74LGi8F8lk5ZMPkFAiEAsaB2pKQWBvuPnNUnbdQXHc-izgsHJUP793woC2xNJlg%3D/lsparams/playback_host%2Cmh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps/lsig/AG3C_xAwRQIgOY4xu4H9wqPVZ7vF2i0hFcOnqrur1XGoA43a7ZEuuSUCIQCyPxBKXUQrKFmknNEGpX5GSWySKgMw_xHBikWpKpKwvg%3D%3D"),
-  preview_frames: [
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L0/default.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLAXobPyrylgm8IEvjlZzqYTiPe1Ow",
-      frame_width: 48,
-      frame_height: 27,
-      page_count: 1,
-      total_count: 100,
-      duration_per_frame: 0,
-      frames_per_page_x: 10,
-      frames_per_page_y: 10,
-    ),
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L1/M$M.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLCWd3ylPF7ViQFBu5RUODMcusr_5g",
-      frame_width: 80,
-      frame_height: 45,
-      page_count: 1,
-      total_count: 83,
-      duration_per_frame: 2000,
-      frames_per_page_x: 10,
-      frames_per_page_y: 10,
-    ),
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L2/M$M.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLA6xat5cfw0e3EX_5SW-TPwkmExxA",
-      frame_width: 160,
-      frame_height: 90,
-      page_count: 4,
-      total_count: 83,
-      duration_per_frame: 2000,
-      frames_per_page_x: 5,
-      frames_per_page_y: 5,
-    ),
-  ],
  visitor_data: Some("CgtoS1pCMVJTNUJISSirsaWXBg%3D%3D"),
 )
--- a/src/client/snapshots/rustypipeclientplayertestsmap_player_data_desktopmusic.snap
+++ b/src/client/snapshots/rustypipeclientplayertestsmap_player_data_desktopmusic.snap
@ -387,37 +387,5 @@ VideoPlayer(
  expires_in_seconds: 21540,
  hls_manifest_url: None,
  dash_manifest_url: Some("https://manifest.googlevideo.com/api/manifest/dash/expire/1659487474/ei/knDpYub6BojEgAf6jbLgDw/ip/2003%3Ade%3Aaf0e%3A2f00%3Ade47%3A297%3Aa6db%3A774e/id/a4fbddf14c6649b4/source/youtube/requiressl/yes/playback_host/rr5---sn-h0jeenek.googlevideo.com/mh/mQ/mm/31%2C29/mn/sn-h0jeenek%2Csn-h0jelnez/ms/au%2Crdu/mv/m/mvi/5/pl/37/hfr/all/as/fmp4_audio_clear%2Cwebm_audio_clear%2Cwebm2_audio_clear%2Cfmp4_sd_hd_clear%2Cwebm2_sd_hd_clear/initcwndbps/1418750/spc/lT-Khox4YuJQ2wmH79zYALRvsWTPCUc/vprv/1/mt/1659465669/fvip/4/keepalive/yes/fexp/24001373%2C24007246/itag/0/sparams/expire%2Cei%2Cip%2Cid%2Csource%2Crequiressl%2Chfr%2Cas%2Cspc%2Cvprv%2Citag/sig/AOq0QJ8wRAIgErABhAEaoKHUDu9dDbpxE_8gR4b8WWAi61fnu8UKnuICIEYrEKcHvqHdO4V3R7cvSGwi_HGH34IlQsKbziOfMBov/lsparams/playback_host%2Cmh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps/lsig/AG3C_xAwRQIgJxHmH0Sxo3cY_pW_ZzQ3hW9-7oz6K_pZWcUdrDDQ2sQCIQDJYNINQwLgKelgbO3CZYx7sMxdUAFpWdokmRBQ77vwvw%3D%3D"),
-  preview_frames: [
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L0/default.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLAXobPyrylgm8IEvjlZzqYTiPe1Ow",
-      frame_width: 48,
-      frame_height: 27,
-      page_count: 1,
-      total_count: 100,
-      duration_per_frame: 0,
-      frames_per_page_x: 10,
-      frames_per_page_y: 10,
-    ),
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L1/M$M.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLCWd3ylPF7ViQFBu5RUODMcusr_5g",
-      frame_width: 80,
-      frame_height: 45,
-      page_count: 1,
-      total_count: 83,
-      duration_per_frame: 2000,
-      frames_per_page_x: 10,
-      frames_per_page_y: 10,
-    ),
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L2/M$M.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLA6xat5cfw0e3EX_5SW-TPwkmExxA",
-      frame_width: 160,
-      frame_height: 90,
-      page_count: 4,
-      total_count: 83,
-      duration_per_frame: 2000,
-      frames_per_page_x: 5,
-      frames_per_page_y: 5,
-    ),
-  ],
  visitor_data: Some("CgszSHZWNWs0SDhpTSiS4aWXBg%3D%3D"),
 )
--- a/src/client/snapshots/rustypipeclientplayertestsmap_player_data_ios.snap
+++ b/src/client/snapshots/rustypipeclientplayertestsmap_player_data_ios.snap
@ -168,37 +168,5 @@ VideoPlayer(
  expires_in_seconds: 21540,
  hls_manifest_url: Some("https://manifest.googlevideo.com/api/manifest/hls_variant/expire/1659481355/ei/q1jpYq-xHs7NgQev0bfwAQ/ip/2003%3Ade%3Aaf0e%3A2f00%3Ade47%3A297%3Aa6db%3A774e/id/a4fbddf14c6649b4/source/youtube/requiressl/yes/playback_host/rr4---sn-h0jelnez.googlevideo.com/mh/mQ/mm/31%2C29/mn/sn-h0jelnez%2Csn-h0jeenek/ms/au%2Crdu/mv/m/mvi/4/pl/37/hfr/1/demuxed/1/tts_caps/1/maudio/1/initcwndbps/1513750/vprv/1/go/1/mt/1659459429/fvip/5/nvgoi/1/short_key/1/ncsapi/1/keepalive/yes/fexp/24001373%2C24007246/dover/13/itag/0/playlist_type/DVR/sparams/expire%2Cei%2Cip%2Cid%2Csource%2Crequiressl%2Chfr%2Cdemuxed%2Ctts_caps%2Cmaudio%2Cvprv%2Cgo%2Citag%2Cplaylist_type/sig/AOq0QJ8wRQIhAIYnEHvIgJtJ8hehAXNtVY3qsgsq_GdOhWf2hkJZe6lCAiBxaRY_nubYp6hBizcAg_KFkKnkG-t2XYLRQ5wGdM3AjA%3D%3D/lsparams/playback_host%2Cmh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps/lsig/AG3C_xAwRgIhAM_91Kk_0VLuSsR6nLCY7LdtWojyRAzXSScd_X9ShRROAiEA1AF4VY04F71NsAI8_j3iqjuXnWL9s6NoXHq7P8-bHx8%3D/file/index.m3u8"),
  dash_manifest_url: None,
-  preview_frames: [
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L0/default.jpg?sqp=-oaymwGbA0g48quKqQOSA4gBAZUBAAAEQpgBMqABPKgBBLABELABDbABDLABELABFbABH7ABJrABLbABDrABDrABD7ABErABF7ABK7ABLLABKbABD7ABDrABELABFbABH7ABKrABMrABKbABD7ABEbABFLABGLABJrABPbABOLABLbABEbABFLABHrABKrABMbABS7ABR7ABNrABFbABHLABKbABLrABObABR7ABTbABP7ABJbABLrABN7ABPbABR7ABUrABUbABRbABM7ABQLABQrABQ7ABTLABRLABRrABQ7gBEbgBEbgBFbgBI7gBRLgBQ7gBQ7gBQ7gBEbgBE7gBFrgBL7gBQ7gBQ7gBQ7gBQ7gBFbgBFrgBKbgBQ7gBQ7gBQ7gBQ7gBQ7gBI7gBL7gBQ7gBQ7gBQ7gBQ7gBQ7gBQ7gBRLgBQ7gBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQ7gBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQrgBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQrgBQrgBQ7gBQ7gBQ7gBQrgBQrgBQrgBQrgBQqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLCsCT8Lprh2S0ptmCRsWH7VtDl3YQ",
-      frame_width: 48,
-      frame_height: 27,
-      page_count: 1,
-      total_count: 100,
-      duration_per_frame: 0,
-      frames_per_page_x: 10,
-      frames_per_page_y: 10,
-    ),
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L1/M$M.jpg?sqp=-oaymwGbA0g48quKqQOSA4gBAZUBAAAEQpgBMqABPKgBBLABELABDbABDLABELABFbABH7ABJrABLbABDrABDrABD7ABErABF7ABK7ABLLABKbABD7ABDrABELABFbABH7ABKrABMrABKbABD7ABEbABFLABGLABJrABPbABOLABLbABEbABFLABHrABKrABMbABS7ABR7ABNrABFbABHLABKbABLrABObABR7ABTbABP7ABJbABLrABN7ABPbABR7ABUrABUbABRbABM7ABQLABQrABQ7ABTLABRLABRrABQ7gBEbgBEbgBFbgBI7gBRLgBQ7gBQ7gBQ7gBEbgBE7gBFrgBL7gBQ7gBQ7gBQ7gBQ7gBFbgBFrgBKbgBQ7gBQ7gBQ7gBQ7gBQ7gBI7gBL7gBQ7gBQ7gBQ7gBQ7gBQ7gBQ7gBRLgBQ7gBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQ7gBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQrgBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQrgBQrgBQ7gBQ7gBQ7gBQrgBQrgBQrgBQrgBQqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLBXrdgfuYV1WLnTGXqZtSAUm8oZCA",
-      frame_width: 80,
-      frame_height: 45,
-      page_count: 1,
-      total_count: 83,
-      duration_per_frame: 2000,
-      frames_per_page_x: 10,
-      frames_per_page_y: 10,
-    ),
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L2/M$M.jpg?sqp=-oaymwGbA0g48quKqQOSA4gBAZUBAAAEQpgBMqABPKgBBLABELABDbABDLABELABFbABH7ABJrABLbABDrABDrABD7ABErABF7ABK7ABLLABKbABD7ABDrABELABFbABH7ABKrABMrABKbABD7ABEbABFLABGLABJrABPbABOLABLbABEbABFLABHrABKrABMbABS7ABR7ABNrABFbABHLABKbABLrABObABR7ABTbABP7ABJbABLrABN7ABPbABR7ABUrABUbABRbABM7ABQLABQrABQ7ABTLABRLABRrABQ7gBEbgBEbgBFbgBI7gBRLgBQ7gBQ7gBQ7gBEbgBE7gBFrgBL7gBQ7gBQ7gBQ7gBQ7gBFbgBFrgBKbgBQ7gBQ7gBQ7gBQ7gBQ7gBI7gBL7gBQ7gBQ7gBQ7gBQ7gBQ7gBQ7gBRLgBQ7gBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQ7gBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQrgBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQrgBQrgBQ7gBQ7gBQ7gBQrgBQrgBQrgBQrgBQqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLCRazj84zMuwJLaCCc_PiUakX_YdQ",
-      frame_width: 160,
-      frame_height: 90,
-      page_count: 4,
-      total_count: 83,
-      duration_per_frame: 2000,
-      frames_per_page_x: 5,
-      frames_per_page_y: 5,
-    ),
-  ],
  visitor_data: Some("Cgs4TXV4dk13WVEyWSirsaWXBg%3D%3D"),
 )
--- a/src/client/snapshots/rustypipeclientplayertestsmap_player_data_tvhtml5embed.snap
+++ b/src/client/snapshots/rustypipeclientplayertestsmap_player_data_tvhtml5embed.snap
@ -569,37 +569,5 @@ VideoPlayer(
  expires_in_seconds: 21540,
  hls_manifest_url: None,
  dash_manifest_url: Some("https://manifest.googlevideo.com/api/manifest/dash/expire/1659481355/ei/q1jpYv-eJ9uF6dsPhvyH8As/ip/2003%3Ade%3Aaf0e%3A2f00%3Ade47%3A297%3Aa6db%3A774e/id/a4fbddf14c6649b4/source/youtube/requiressl/yes/playback_host/rr4---sn-h0jelnez.googlevideo.com/mh/mQ/mm/31%2C29/mn/sn-h0jelnez%2Csn-h0jeenek/ms/au%2Crdu/mv/m/mvi/4/pl/37/hfr/all/as/fmp4_audio_clear%2Cfmp4_sd_hd_clear/initcwndbps/1527500/vprv/1/mt/1659459429/fvip/5/keepalive/yes/fexp/24001373%2C24007246/itag/0/sparams/expire%2Cei%2Cip%2Cid%2Csource%2Crequiressl%2Chfr%2Cas%2Cvprv%2Citag/sig/AOq0QJ8wRQIhANKWS7GCN4pSoHIQ6BMZdOaHAD0I25nHwRj7ds4qrxdEAiBsd9l8WIceqF7-2xyR82DGecCiS9hgUIPJhdNhkwVpHg%3D%3D/lsparams/playback_host%2Cmh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps/lsig/AG3C_xAwRQIgMbu-wTOcXGCwGh27y0YZHktumKM1sopgxfQf8LCcCnECIQDnhFbgddOxwiQbnMOIcCn6ncpN54UyALRNigUSCp9Deg%3D%3D"),
-  preview_frames: [
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L0/default.jpg?sqp=-oaymwGbA0g48quKqQOSA4gBAZUBAAAEQpgBMqABPKgBBLABELABDbABDLABELABFbABH7ABJrABLbABDrABDrABD7ABErABF7ABK7ABLLABKbABD7ABDrABELABFbABH7ABKrABMrABKbABD7ABEbABFLABGLABJrABPbABOLABLbABEbABFLABHrABKrABMbABS7ABR7ABNrABFbABHLABKbABLrABObABR7ABTbABP7ABJbABLrABN7ABPbABR7ABUrABUbABRbABM7ABQLABQrABQ7ABTLABRLABRrABQ7gBEbgBEbgBFbgBI7gBRLgBQ7gBQ7gBQ7gBEbgBE7gBFrgBL7gBQ7gBQ7gBQ7gBQ7gBFbgBFrgBKbgBQ7gBQ7gBQ7gBQ7gBQ7gBI7gBL7gBQ7gBQ7gBQ7gBQ7gBQ7gBQ7gBRLgBQ7gBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQ7gBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQrgBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQrgBQrgBQ7gBQ7gBQ7gBQrgBQrgBQrgBQrgBQqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLCsCT8Lprh2S0ptmCRsWH7VtDl3YQ",
-      frame_width: 48,
-      frame_height: 27,
-      page_count: 1,
-      total_count: 100,
-      duration_per_frame: 0,
-      frames_per_page_x: 10,
-      frames_per_page_y: 10,
-    ),
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L1/M$M.jpg?sqp=-oaymwGbA0g48quKqQOSA4gBAZUBAAAEQpgBMqABPKgBBLABELABDbABDLABELABFbABH7ABJrABLbABDrABDrABD7ABErABF7ABK7ABLLABKbABD7ABDrABELABFbABH7ABKrABMrABKbABD7ABEbABFLABGLABJrABPbABOLABLbABEbABFLABHrABKrABMbABS7ABR7ABNrABFbABHLABKbABLrABObABR7ABTbABP7ABJbABLrABN7ABPbABR7ABUrABUbABRbABM7ABQLABQrABQ7ABTLABRLABRrABQ7gBEbgBEbgBFbgBI7gBRLgBQ7gBQ7gBQ7gBEbgBE7gBFrgBL7gBQ7gBQ7gBQ7gBQ7gBFbgBFrgBKbgBQ7gBQ7gBQ7gBQ7gBQ7gBI7gBL7gBQ7gBQ7gBQ7gBQ7gBQ7gBQ7gBRLgBQ7gBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQ7gBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQrgBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQrgBQrgBQ7gBQ7gBQ7gBQrgBQrgBQrgBQrgBQqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLBXrdgfuYV1WLnTGXqZtSAUm8oZCA",
-      frame_width: 80,
-      frame_height: 45,
-      page_count: 1,
-      total_count: 83,
-      duration_per_frame: 2000,
-      frames_per_page_x: 10,
-      frames_per_page_y: 10,
-    ),
-    Frameset(
-      url_template: "https://i.ytimg.com/sb/pPvd8UxmSbQ/storyboard3_L2/M$M.jpg?sqp=-oaymwGbA0g48quKqQOSA4gBAZUBAAAEQpgBMqABPKgBBLABELABDbABDLABELABFbABH7ABJrABLbABDrABDrABD7ABErABF7ABK7ABLLABKbABD7ABDrABELABFbABH7ABKrABMrABKbABD7ABEbABFLABGLABJrABPbABOLABLbABEbABFLABHrABKrABMbABS7ABR7ABNrABFbABHLABKbABLrABObABR7ABTbABP7ABJbABLrABN7ABPbABR7ABUrABUbABRbABM7ABQLABQrABQ7ABTLABRLABRrABQ7gBEbgBEbgBFbgBI7gBRLgBQ7gBQ7gBQ7gBEbgBE7gBFrgBL7gBQ7gBQ7gBQ7gBQ7gBFbgBFrgBKbgBQ7gBQ7gBQ7gBQ7gBQ7gBI7gBL7gBQ7gBQ7gBQ7gBQ7gBQ7gBQ7gBRLgBQ7gBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQ7gBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQrgBQ7gBQ7gBQ7gBQ7gBQrgBQrgBQrgBQrgBQ7gBQ7gBQ7gBQrgBQrgBQrgBQrgBQqLzl_8DBgjf8LPxBQ==&sigh=rs$AOn4CLCRazj84zMuwJLaCCc_PiUakX_YdQ",
-      frame_width: 160,
-      frame_height: 90,
-      page_count: 4,
-      total_count: 83,
-      duration_per_frame: 2000,
-      frames_per_page_x: 5,
-      frames_per_page_y: 5,
-    ),
-  ],
  visitor_data: Some("CgtacUJOMG81dTI3cyirsaWXBg%3D%3D"),
 )
--- a/src/error.rs
+++ b/src/error.rs
@ -171,12 +171,6 @@ impl From<reqwest::Error> for Error {
    }
 }

-impl From<serde_plain::Error> for Error {
-    fn from(value: serde_plain::Error) -> Self {
-        Self::Other(value.to_string().into())
-    }
-}
-
 impl ExtractionError {
    pub(crate) fn should_report(&self) -> bool {
        matches!(
--- a/src/model/frameset.rs
+++ b/src/model/frameset.rs
@ -1,61 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-/// Set of video frames for seek preview
-///
-/// YouTube generates a set of images containing a grid of frames for each video.
-/// These images are used by the player for the seekbar preview.
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
-#[non_exhaustive]
-pub struct Frameset {
-    /// Url template of the frameset
-    ///
-    /// The `$M` placeholder has to be replaced with the page index (starting from 0).
-    pub url_template: String,
-    /// Width of a single frame in pixels
-    pub frame_width: u32,
-    /// Height of a single frame in pixels
-    pub frame_height: u32,
-    /// Number of pages (individual images)
-    pub page_count: u32,
-    /// Total number of frames in the set
-    pub total_count: u32,
-    /// Duration per frame in milliseconds
-    pub duration_per_frame: u32,
-    /// Number of frames in the x direction
-    pub frames_per_page_x: u32,
-    /// Number of frames in the y direction.
-    pub frames_per_page_y: u32,
-}
-
-/// Iterator producing frameset page urls
-pub struct FramesetUrls<'a> {
-    frameset: &'a Frameset,
-    i: u32,
-}
-
-impl Frameset {
-    /// Gets an iterator over the page URLs of the frameset
-    pub fn urls(&self) -> FramesetUrls {
-        FramesetUrls {
-            frameset: self,
-            i: 0,
-        }
-    }
-}
-
-impl Iterator for FramesetUrls<'_> {
-    type Item = String;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.i < self.frameset.page_count {
-            let url = self
-                .frameset
-                .url_template
-                .replace("$M", &self.i.to_string());
-            self.i += 1;
-            Some(url)
-        } else {
-            None
-        }
-    }
-}
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@ -1,23 +1,24 @@
 //! YouTube API response models

 mod convert;
-mod frameset;
 mod ordering;

 pub mod paginator;
 pub mod richtext;
+
 pub mod traits;
-pub use frameset::{Frameset, FramesetUrls};
+
+use serde_with::serde_as;

 use std::{collections::BTreeSet, ops::Range};

 use serde::{Deserialize, Serialize};
-use serde_with::serde_as;
 use time::{Date, OffsetDateTime};

-use self::{paginator::Paginator, richtext::RichText};
 use crate::{error::Error, param::Country, serializer::DateYmd, util};

+use self::{paginator::Paginator, richtext::RichText};
+
 /*
 #COMMON
 */
@ -154,8 +155,6 @@ pub struct VideoPlayer {
    pub hls_manifest_url: Option<String>,
    /// Dash manifest URL (for livestreams)
    pub dash_manifest_url: Option<String>,
-    /// Video frames for seek preview
-    pub preview_frames: Vec<Frameset>,
    /// YouTube visitor data cookie
    pub visitor_data: Option<String>,
 }
@ -343,14 +342,14 @@ pub enum VideoFormat {
 pub struct AudioTrack {
    /// Track ID (e.g. `en.0`)
    pub id: String,
-    /// Language code (e.g. `en-US`, `de`)
+    /// 2/3 letter language code (e.g. `en`)
+    ///
+    /// Extracted from the track ID
    pub lang: Option<String>,
    /// Language name (e.g. "English")
    pub lang_name: String,
    /// True if this is the default audio track
    pub is_default: bool,
-    /// Audio track type (e.g. *Original*, *Dubbed*)
-    pub track_type: Option<AudioTrackType>,
 }

 /// Audio file type
@ -364,25 +363,6 @@ pub enum AudioFormat {
    Webm,
 }

-/// Audio track type
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
-#[serde(rename_all = "snake_case")]
-#[non_exhaustive]
-pub enum AudioTrackType {
-    /// An original audio track of the video
-    Original,
-    /// An audio track with the original voices replaced, typically in a different language
-    Dubbed,
-    /// A descriptive audio track
-    ///
-    /// A descriptive audio track is an audio track in which descriptions of visual elements of
-    /// a video are added to the original audio, with the goal to make a video more accessible to
-    /// blind and visually impaired people.
-    ///
-    /// See <https://en.wikipedia.org/wiki/Audio_description>
-    Descriptive,
-}
-
 /// YouTube provides subtitles in different formats.
 ///
 /// srv1 (XML) is the default format, to request a different format you have
@ -870,7 +850,7 @@ pub struct VideoItem {
    pub publish_date: Option<OffsetDateTime>,
    /// Textual video publish date (e.g. `11 months ago`, depends on language)
    ///
-    /// Is [`None`] for livestreams and upcoming videos.
+    /// Is [`None`] for livestreams.
    pub publish_date_txt: Option<String>,
    /// View count
    ///
--- a/src/model/paginator.rs
+++ b/src/model/paginator.rs
@ -34,7 +34,7 @@ pub struct Paginator<T> {
    #[serde(skip_serializing_if = "Option::is_none")]
    pub visitor_data: Option<String>,
    /// YouTube API endpoint to fetch continuations from
-    pub endpoint: ContinuationEndpoint,
+    pub(crate) endpoint: ContinuationEndpoint,
 }

 impl<T> Default for Paginator<T> {
--- a/src/param/locale.rs
+++ b/src/param/locale.rs
@ -2,12 +2,10 @@

 //! Languages and countries

-use std::str::FromStr;
+use std::{fmt::Display, str::FromStr};

 use serde::{Deserialize, Serialize};

-use crate::error::Error;
-
 /// Available languages
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[serde(rename_all = "lowercase")]
@ -15,31 +13,31 @@ use crate::error::Error;
 pub enum Language {
    /// Afrikaans
    Af,
-    /// Amharic / አማርኛ
+    /// አማርኛ
    Am,
-    /// Arabic / العربية
+    /// العربية
    Ar,
-    /// Assamese / অসমীয়া
+    /// অসমীয়া
    As,
-    /// Azerbaijani / Azərbaycan
+    /// Azərbaycan
    Az,
-    /// Belarusian / Беларуская
+    /// Беларуская
    Be,
-    /// Bulgarian / Български
+    /// Български
    Bg,
-    /// Bangla / বাংলা
+    /// বাংলা
    Bn,
-    /// Bosnian / Bosanski
+    /// Bosanski
    Bs,
-    /// Catalan / Català
+    /// Català
    Ca,
-    /// Czech / Čeština
+    /// Čeština
    Cs,
-    /// Danish / Dansk
+    /// Dansk
    Da,
-    /// German / Deutsch
+    /// Deutsch
    De,
-    /// Greek / Ελληνικά
+    /// Ελληνικά
    El,
    /// English (US)
    En,
@ -49,145 +47,145 @@ pub enum Language {
    /// English (India)
    #[serde(rename = "en-IN")]
    EnIn,
-    /// Spanish / Español (España)
+    /// Español (España)
    Es,
-    /// Latin American Spanish / Español (Latinoamérica)
+    /// Español (Latinoamérica)
    #[serde(rename = "es-419")]
    Es419,
-    /// Spanish (United States) / Español (US)
+    /// Español (US)
    #[serde(rename = "es-US")]
    EsUs,
-    /// Estonian / Eesti
+    /// Eesti
    Et,
-    /// Basque / Euskara
+    /// Euskara
    Eu,
-    /// Persian / فارسی
+    /// فارسی
    Fa,
-    /// Finnish / Suomi
+    /// Suomi
    Fi,
    /// Filipino
    Fil,
-    /// French / Français
+    /// Français
    Fr,
-    /// Canadian French / Français (Canada)
+    /// Français (Canada)
    #[serde(rename = "fr-CA")]
    FrCa,
-    /// Galician / Galego
+    /// Galego
    Gl,
-    /// Gujarati / ગુજરાતી
+    /// ગુજરાતી
    Gu,
-    /// Hindi / हिन्दी
+    /// हिन्दी
    Hi,
-    /// Croatian / Hrvatski
+    /// Hrvatski
    Hr,
-    /// Hungarian / Magyar
+    /// Magyar
    Hu,
-    /// Armenian / Հայերեն
+    /// Հայերեն
    Hy,
-    /// Indonesian / Bahasa Indonesia
+    /// Bahasa Indonesia
    Id,
-    /// Icelandic / Íslenska
+    /// Íslenska
    Is,
-    /// Italian / Italiano
+    /// Italiano
    It,
-    /// Hebrew / עברית
+    /// עברית
    Iw,
-    /// Japanese / 日本語
+    /// 日本語
    Ja,
-    /// Georgian / ქართული
+    /// ქართული
    Ka,
-    /// Kazakh / Қазақ Тілі
+    /// Қазақ Тілі
    Kk,
-    /// Khmer / ខ្មែរ
+    /// ខ្មែរ
    Km,
-    /// Kannada / ಕನ್ನಡ
+    /// ಕನ್ನಡ
    Kn,
-    /// Korean / 한국어
+    /// 한국어
    Ko,
-    /// Kyrgyz / Кыргызча
+    /// Кыргызча
    Ky,
-    /// Lao / ລາວ
+    /// ລາວ
    Lo,
-    /// Lithuanian / Lietuvių
+    /// Lietuvių
    Lt,
-    /// Latvian / Latviešu valoda
+    /// Latviešu valoda
    Lv,
-    /// Macedonian / Македонски
+    /// Македонски
    Mk,
-    /// Malayalam / മലയാളം
+    /// മലയാളം
    Ml,
-    /// Mongolian / Монгол
+    /// Монгол
    Mn,
-    /// Marathi / मराठी
+    /// मराठी
    Mr,
-    /// Malay / Bahasa Malaysia
+    /// Bahasa Malaysia
    Ms,
-    /// Burmese / ဗမာ
+    /// ဗမာ
    My,
-    /// Nepali / नेपाली
+    /// नेपाली
    Ne,
-    /// Dutch / Nederlands
+    /// Nederlands
    Nl,
-    /// Norwegian / Norsk
+    /// Norsk
    No,
-    /// Odia / ଓଡ଼ିଆ
+    /// ଓଡ଼ିଆ
    Or,
-    /// Punjabi / ਪੰਜਾਬੀ
+    /// ਪੰਜਾਬੀ
    Pa,
-    /// Polish / Polski
+    /// Polski
    Pl,
-    /// Portuguese / Português (Brasil)
+    /// Português (Brasil)
    Pt,
-    /// European Portuguese / Português
+    /// Português
    #[serde(rename = "pt-PT")]
    PtPt,
-    /// Romanian / Română
+    /// Română
    Ro,
-    /// Russian / Русский
+    /// Русский
    Ru,
-    /// Sinhala / සිංහල
+    /// සිංහල
    Si,
-    /// Slovak / Slovenčina
+    /// Slovenčina
    Sk,
-    /// Slovenian / Slovenščina
+    /// Slovenščina
    Sl,
-    /// Albanian / Shqip
+    /// Shqip
    Sq,
-    /// Serbian / Српски
+    /// Српски
    Sr,
-    /// Serbian (Latin) / Srpski
+    /// Srpski
    #[serde(rename = "sr-Latn")]
    SrLatn,
-    /// Swedish / Svenska
+    /// Svenska
    Sv,
-    /// Swahili / Kiswahili
+    /// Kiswahili
    Sw,
-    /// Tamil / தமிழ்
+    /// தமிழ்
    Ta,
-    /// Telugu / తెలుగు
+    /// తెలుగు
    Te,
-    /// Thai / ภาษาไทย
+    /// ภาษาไทย
    Th,
-    /// Turkish / Türkçe
+    /// Türkçe
    Tr,
-    /// Ukrainian / Українська
+    /// Українська
    Uk,
-    /// Urdu / اردو
+    /// اردو
    Ur,
-    /// Uzbek / O‘zbek
+    /// O‘zbek
    Uz,
-    /// Vietnamese / Tiếng Việt
+    /// Tiếng Việt
    Vi,
-    /// Chinese (China) / 中文 (简体)
+    /// 中文 (简体)
    #[serde(rename = "zh-CN")]
    ZhCn,
-    /// Chinese (Hong Kong) / 中文 (香港)
+    /// 中文 (香港)
    #[serde(rename = "zh-HK")]
    ZhHk,
-    /// Chinese (Taiwan) / 中文 (繁體)
+    /// 中文 (繁體)
    #[serde(rename = "zh-TW")]
    ZhTw,
-    /// Zulu / IsiZulu
+    /// IsiZulu
    Zu,
 }

@ -831,26 +829,32 @@ impl Country {
    }
 }

-impl FromStr for Language {
-    type Err = Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut sub = s;
-        loop {
-            if let Ok(v) = serde_plain::from_str(sub) {
-                return Ok(v);
-            }
-            match sub.rfind('-') {
-                Some(pos) => {
-                    sub = &sub[..pos];
-                }
-                None => return Err(Error::Other("could not parse language `{s}`".into())),
-            }
-        }
+impl Display for Language {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(
+            &serde_json::to_string(self).map_or("".to_owned(), |s| s[1..s.len() - 1].to_owned()),
+        )
    }
 }

-serde_plain::derive_display_from_serialize!(Language);
+impl Display for Country {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(
+            &serde_json::to_string(self).map_or("".to_owned(), |s| s[1..s.len() - 1].to_owned()),
+        )
+    }
+}

-serde_plain::derive_fromstr_from_deserialize!(Country, Error);
-serde_plain::derive_display_from_serialize!(Country);
+impl FromStr for Language {
+    type Err = serde_json::Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        serde_json::from_str(&format!("\"{s}\""))
+    }
+}
+
+impl FromStr for Country {
+    type Err = serde_json::Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        serde_json::from_str(&format!("\"{s}\""))
+    }
+}
--- a/src/param/mod.rs
+++ b/src/param/mod.rs
@ -7,34 +7,3 @@ pub mod search_filter;

 pub use locale::{Country, Language};
 pub use stream_filter::StreamFilter;
-
-/// Channel video tab
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ChannelVideoTab {
-    /// Regular videos
-    Videos,
-    /// Short videos
-    Shorts,
-    /// Livestreams
-    Live,
-}
-
-/// Sort order for channel videos
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ChannelOrder {
-    /// Order videos with the latest upload date first (default)
-    Latest = 1,
-    /// Order videos with the highest number of views first
-    Popular = 2,
-}
-
-impl ChannelVideoTab {
-    /// Get the tab ID used to create ordered continuation tokens
-    pub(crate) const fn order_ctoken_id(&self) -> u32 {
-        match self {
-            ChannelVideoTab::Videos => 15,
-            ChannelVideoTab::Shorts => 10,
-            ChannelVideoTab::Live => 14,
-        }
-    }
-}
--- a/src/param/search_filter.rs
+++ b/src/param/search_filter.rs
@ -2,7 +2,7 @@

 use std::collections::BTreeSet;

-use crate::util::ProtoBuilder;
+use crate::util::{self, ProtoBuilder};

 /// YouTube search filter
 ///
@ -200,7 +200,8 @@ impl SearchFilter {
            pb.embedded(8, extras)
        }

-        pb.to_base64()
+        let b64 = util::b64_encode(pb.bytes);
+        urlencoding::encode(&b64).to_string()
    }
 }

--- a/src/param/stream_filter.rs
+++ b/src/param/stream_filter.rs
@ -352,13 +352,13 @@ mod tests {
    });

    #[rstest]
-    #[case::default(StreamFilter::default(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=16104136&dur=1012.661&ei=6OtcZNqtBdOi7gP1upHYCQ&expire=1683832904&fexp=24007246&fvip=2&gir=yes&id=o-ABVtPh3j24hkJeXp8igjvreyODn-oV0CacOqb7pDjJoG&initcwndbps=1720000&ip=2003%3Ade%3Aaf31%3A5200%3A791a%3A897%3Ac15c%3Aae59&itag=251&keepalive=yes&lmt=1683782301237288&lsig=AG3C_xAwRQIgC7HZtYuc6dI92m6wCcoXYpdzSpVtPTIbO7jBKGpUrYMCIQCc0WNtFvN8Awqx9uuRVp5SUSe3rOt2D7M-rCKpgVv_0A%3D%3D&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fwebm&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1683811031&mv=m&mvi=4&n=U8mCOo4eYD4n0A&ns=LToEdXWVFHcH53e3aTe1N7kN&pl=37&requiressl=yes&sig=AOq0QJ8wRQIhAPcUhhfkNVA_JcdU6KLTOFjRCnNl6n8gamJA-Q0PgCpIAiBTMV2k2JfHzbHBtsHxuNW7zHvSaYaUbz-dEIQC45o1eA%3D%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Csvpuc%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=qEK7B81AP536F3aOi5JzMyLCUDiktWigtEpf9nI2xg&svpuc=1&txp=4532434&vprv=1&xtags=acont%3Doriginal%3Alang%3Den-US"))]
-    #[case::bitrate(StreamFilter::default().audio_max_bitrate(100000).to_owned(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=8217508&dur=1012.661&ei=6OtcZNqtBdOi7gP1upHYCQ&expire=1683832904&fexp=24007246&fvip=2&gir=yes&id=o-ABVtPh3j24hkJeXp8igjvreyODn-oV0CacOqb7pDjJoG&initcwndbps=1720000&ip=2003%3Ade%3Aaf31%3A5200%3A791a%3A897%3Ac15c%3Aae59&itag=250&keepalive=yes&lmt=1683782195315620&lsig=AG3C_xAwRQIgC7HZtYuc6dI92m6wCcoXYpdzSpVtPTIbO7jBKGpUrYMCIQCc0WNtFvN8Awqx9uuRVp5SUSe3rOt2D7M-rCKpgVv_0A%3D%3D&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fwebm&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1683811031&mv=m&mvi=4&n=U8mCOo4eYD4n0A&ns=LToEdXWVFHcH53e3aTe1N7kN&pl=37&requiressl=yes&sig=AOq0QJ8wRQIga2iMQsToMxO7hTOx0gNAzhYoV1lL5PpE9lkAuBXt1nkCIQCuFuQXWNixIquEugtkT1C9khuKRP_C-wzSOiUmRp1DRg%3D%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Csvpuc%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=qEK7B81AP536F3aOi5JzMyLCUDiktWigtEpf9nI2xg&svpuc=1&txp=4532434&vprv=1&xtags=acont%3Doriginal%3Alang%3Den-US"))]
-    #[case::m4a_format(StreamFilter::default().audio_formats(&[AudioFormat::M4a]).to_owned(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=16390508&dur=1012.691&ei=6OtcZNqtBdOi7gP1upHYCQ&expire=1683832904&fexp=24007246&fvip=2&gir=yes&id=o-ABVtPh3j24hkJeXp8igjvreyODn-oV0CacOqb7pDjJoG&initcwndbps=1720000&ip=2003%3Ade%3Aaf31%3A5200%3A791a%3A897%3Ac15c%3Aae59&itag=140&keepalive=yes&lmt=1683782363698612&lsig=AG3C_xAwRQIgC7HZtYuc6dI92m6wCcoXYpdzSpVtPTIbO7jBKGpUrYMCIQCc0WNtFvN8Awqx9uuRVp5SUSe3rOt2D7M-rCKpgVv_0A%3D%3D&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fmp4&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1683811031&mv=m&mvi=4&n=U8mCOo4eYD4n0A&ns=LToEdXWVFHcH53e3aTe1N7kN&pl=37&requiressl=yes&sig=AOq0QJ8wRgIhAMgM470I-QXq4lTRuPtXf5UInHB_tG0tTGXRhVZ6nwImAiEAn0JYRknq5dtTwcmzZheekxVOZKhZ2Rpxc_UyvX2CMRY%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Csvpuc%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=qEK7B81AP536F3aOi5JzMyLCUDiktWigtEpf9nI2xg&svpuc=1&txp=4532434&vprv=1&xtags=acont%3Doriginal%3Alang%3Den-US"))]
-    #[case::m4a_codec(StreamFilter::default().audio_codecs(&[AudioCodec::Mp4a]).to_owned(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=16390508&dur=1012.691&ei=6OtcZNqtBdOi7gP1upHYCQ&expire=1683832904&fexp=24007246&fvip=2&gir=yes&id=o-ABVtPh3j24hkJeXp8igjvreyODn-oV0CacOqb7pDjJoG&initcwndbps=1720000&ip=2003%3Ade%3Aaf31%3A5200%3A791a%3A897%3Ac15c%3Aae59&itag=140&keepalive=yes&lmt=1683782363698612&lsig=AG3C_xAwRQIgC7HZtYuc6dI92m6wCcoXYpdzSpVtPTIbO7jBKGpUrYMCIQCc0WNtFvN8Awqx9uuRVp5SUSe3rOt2D7M-rCKpgVv_0A%3D%3D&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fmp4&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1683811031&mv=m&mvi=4&n=U8mCOo4eYD4n0A&ns=LToEdXWVFHcH53e3aTe1N7kN&pl=37&requiressl=yes&sig=AOq0QJ8wRgIhAMgM470I-QXq4lTRuPtXf5UInHB_tG0tTGXRhVZ6nwImAiEAn0JYRknq5dtTwcmzZheekxVOZKhZ2Rpxc_UyvX2CMRY%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Csvpuc%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=qEK7B81AP536F3aOi5JzMyLCUDiktWigtEpf9nI2xg&svpuc=1&txp=4532434&vprv=1&xtags=acont%3Doriginal%3Alang%3Den-US"))]
-    #[case::french(StreamFilter::default().audio_language("fr").to_owned(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=940286&dur=60.101&ei=6OtcZNqtBdOi7gP1upHYCQ&expire=1683832904&fexp=24007246&fvip=2&gir=yes&id=o-ABVtPh3j24hkJeXp8igjvreyODn-oV0CacOqb7pDjJoG&initcwndbps=1720000&ip=2003%3Ade%3Aaf31%3A5200%3A791a%3A897%3Ac15c%3Aae59&itag=251&keepalive=yes&lmt=1683774002236584&lsig=AG3C_xAwRQIgC7HZtYuc6dI92m6wCcoXYpdzSpVtPTIbO7jBKGpUrYMCIQCc0WNtFvN8Awqx9uuRVp5SUSe3rOt2D7M-rCKpgVv_0A%3D%3D&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fwebm&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1683811031&mv=m&mvi=4&n=U8mCOo4eYD4n0A&ns=LToEdXWVFHcH53e3aTe1N7kN&pl=37&requiressl=yes&sig=AOq0QJ8wRQIhAIUUin7WZBnoVDb2p0wuTPc7HZwbF8I5sxzLrVN9WeBwAiBQTZwhxCQ1IdrUkkD1-cSGYBtMF1aKkjPZ-LWeie0aZA%3D%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Csvpuc%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=qEK7B81AP536F3aOi5JzMyLCUDiktWigtEpf9nI2xg&svpuc=1&txp=4532434&vprv=1&xtags=acont%3Ddubbed%3Alang%3Dfr"))]
-    #[case::br_fallback(StreamFilter::default().audio_max_bitrate(0).to_owned(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=6306327&dur=1012.661&ei=6OtcZNqtBdOi7gP1upHYCQ&expire=1683832904&fexp=24007246&fvip=2&gir=yes&id=o-ABVtPh3j24hkJeXp8igjvreyODn-oV0CacOqb7pDjJoG&initcwndbps=1720000&ip=2003%3Ade%3Aaf31%3A5200%3A791a%3A897%3Ac15c%3Aae59&itag=249&keepalive=yes&lmt=1683782187865292&lsig=AG3C_xAwRQIgC7HZtYuc6dI92m6wCcoXYpdzSpVtPTIbO7jBKGpUrYMCIQCc0WNtFvN8Awqx9uuRVp5SUSe3rOt2D7M-rCKpgVv_0A%3D%3D&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fwebm&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1683811031&mv=m&mvi=4&n=U8mCOo4eYD4n0A&ns=LToEdXWVFHcH53e3aTe1N7kN&pl=37&requiressl=yes&sig=AOq0QJ8wRAIgW1DTCrLV_GyEM1rdjScgyceZE1llb73KJMFXmPm5Y04CIAYOLZuuzFX4ba5720kMOcQ1-Ld1DULs85nLxJglitCl&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Csvpuc%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=qEK7B81AP536F3aOi5JzMyLCUDiktWigtEpf9nI2xg&svpuc=1&txp=4532434&vprv=1&xtags=acont%3Doriginal%3Alang%3Den-US"))]
-    #[case::lang_fallback(StreamFilter::default().audio_language("xx").to_owned(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=16104136&dur=1012.661&ei=6OtcZNqtBdOi7gP1upHYCQ&expire=1683832904&fexp=24007246&fvip=2&gir=yes&id=o-ABVtPh3j24hkJeXp8igjvreyODn-oV0CacOqb7pDjJoG&initcwndbps=1720000&ip=2003%3Ade%3Aaf31%3A5200%3A791a%3A897%3Ac15c%3Aae59&itag=251&keepalive=yes&lmt=1683782301237288&lsig=AG3C_xAwRQIgC7HZtYuc6dI92m6wCcoXYpdzSpVtPTIbO7jBKGpUrYMCIQCc0WNtFvN8Awqx9uuRVp5SUSe3rOt2D7M-rCKpgVv_0A%3D%3D&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fwebm&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1683811031&mv=m&mvi=4&n=U8mCOo4eYD4n0A&ns=LToEdXWVFHcH53e3aTe1N7kN&pl=37&requiressl=yes&sig=AOq0QJ8wRQIhAPcUhhfkNVA_JcdU6KLTOFjRCnNl6n8gamJA-Q0PgCpIAiBTMV2k2JfHzbHBtsHxuNW7zHvSaYaUbz-dEIQC45o1eA%3D%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Csvpuc%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=qEK7B81AP536F3aOi5JzMyLCUDiktWigtEpf9nI2xg&svpuc=1&txp=4532434&vprv=1&xtags=acont%3Doriginal%3Alang%3Den-US"))]
+    #[case::default(StreamFilter::default(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=16104134&dur=1012.661&ei=498HY6KvArqM6dsPiN6QgAE&expire=1661482051&fexp=24001373%2C24007246&fvip=2&gir=yes&id=o-AK8GbbQovVxldcBz4pkXu4EA9N2sU-4yPPa5hFT3bXta&initcwndbps=1392500&ip=2003%3Ade%3Aaf1e%3A8a00%3A84c6%3A28f3%3A9de2%3A464&itag=251&keepalive=yes&lmt=1659767097097120&lsig=AG3C_xAwRAIgLFPuLqOoHoNQax15AE9Q2YIZ7pM7-olbGWgYGv1MDccCIADKSc_HeOdmD7CDs4AkY5ZtWF4gdZd4rw99Cqlzakbk&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fwebm&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1661460078&mv=m&mvi=4&n=LwUYrFgbIVPzmA&ns=bBqoZtLH6lsaX8ke0xgRMM8H&pl=37&rbqsm=fr&requiressl=yes&sig=AOq0QJ8wRQIgW4IxGJJFRAwZefvDdDkJfjhN7y3bPmh96BCFuyFn6pwCIQDW6pVnk_DwMC3FcZy5rXNUULMNWLdadScxwuhFTFR84g%3D%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=lT-Khmjdu08WYG7DxAg_8xq0R2u5a6w&txp=4532434&vprv=1&xtags=lang%3Den"))]
+    #[case::bitrate(StreamFilter::default().audio_max_bitrate(100000).to_owned(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=8217507&dur=1012.661&ei=498HY6KvArqM6dsPiN6QgAE&expire=1661482051&fexp=24001373%2C24007246&fvip=2&gir=yes&id=o-AK8GbbQovVxldcBz4pkXu4EA9N2sU-4yPPa5hFT3bXta&initcwndbps=1392500&ip=2003%3Ade%3Aaf1e%3A8a00%3A84c6%3A28f3%3A9de2%3A464&itag=250&keepalive=yes&lmt=1659767073159859&lsig=AG3C_xAwRAIgLFPuLqOoHoNQax15AE9Q2YIZ7pM7-olbGWgYGv1MDccCIADKSc_HeOdmD7CDs4AkY5ZtWF4gdZd4rw99Cqlzakbk&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fwebm&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1661460078&mv=m&mvi=4&n=LwUYrFgbIVPzmA&ns=bBqoZtLH6lsaX8ke0xgRMM8H&pl=37&rbqsm=fr&requiressl=yes&sig=AOq0QJ8wRAIgM9loLjlUtgwrALqSek4vO8KljcCltFjLw1TGX0d9lZ4CICRiTJ8a_KgdafXVo2vKwgLPuH2B7t0hF-ln2k_MI3ds&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=lT-Khmjdu08WYG7DxAg_8xq0R2u5a6w&txp=4532434&vprv=1&xtags=lang%3Den"))]
+    #[case::m4a_format(StreamFilter::default().audio_formats(&[AudioFormat::M4a]).to_owned(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=16390628&dur=1012.691&ei=498HY6KvArqM6dsPiN6QgAE&expire=1661482051&fexp=24001373%2C24007246&fvip=2&gir=yes&id=o-AK8GbbQovVxldcBz4pkXu4EA9N2sU-4yPPa5hFT3bXta&initcwndbps=1392500&ip=2003%3Ade%3Aaf1e%3A8a00%3A84c6%3A28f3%3A9de2%3A464&itag=140&keepalive=yes&lmt=1659766154827884&lsig=AG3C_xAwRAIgLFPuLqOoHoNQax15AE9Q2YIZ7pM7-olbGWgYGv1MDccCIADKSc_HeOdmD7CDs4AkY5ZtWF4gdZd4rw99Cqlzakbk&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fmp4&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1661460078&mv=m&mvi=4&n=LwUYrFgbIVPzmA&ns=bBqoZtLH6lsaX8ke0xgRMM8H&pl=37&rbqsm=fr&requiressl=yes&sig=AOq0QJ8wRAIgc8oxPEHDO0cgO3ZcbPmv3nrkzfy52WchpV0HcBcUw24CIEFxLKBcM4vVqGeRkt581dFL2tetvHd93SHCTVEUnIn_&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=lT-Khmjdu08WYG7DxAg_8xq0R2u5a6w&txp=4532434&vprv=1&xtags=lang%3Den"))]
+    #[case::m4a_codec(StreamFilter::default().audio_codecs(&[AudioCodec::Mp4a]).to_owned(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=16390628&dur=1012.691&ei=498HY6KvArqM6dsPiN6QgAE&expire=1661482051&fexp=24001373%2C24007246&fvip=2&gir=yes&id=o-AK8GbbQovVxldcBz4pkXu4EA9N2sU-4yPPa5hFT3bXta&initcwndbps=1392500&ip=2003%3Ade%3Aaf1e%3A8a00%3A84c6%3A28f3%3A9de2%3A464&itag=140&keepalive=yes&lmt=1659766154827884&lsig=AG3C_xAwRAIgLFPuLqOoHoNQax15AE9Q2YIZ7pM7-olbGWgYGv1MDccCIADKSc_HeOdmD7CDs4AkY5ZtWF4gdZd4rw99Cqlzakbk&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fmp4&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1661460078&mv=m&mvi=4&n=LwUYrFgbIVPzmA&ns=bBqoZtLH6lsaX8ke0xgRMM8H&pl=37&rbqsm=fr&requiressl=yes&sig=AOq0QJ8wRAIgc8oxPEHDO0cgO3ZcbPmv3nrkzfy52WchpV0HcBcUw24CIEFxLKBcM4vVqGeRkt581dFL2tetvHd93SHCTVEUnIn_&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=lT-Khmjdu08WYG7DxAg_8xq0R2u5a6w&txp=4532434&vprv=1&xtags=lang%3Den"))]
+    #[case::french(StreamFilter::default().audio_language("fr").to_owned(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=16357630&dur=1012.721&ei=498HY6KvArqM6dsPiN6QgAE&expire=1661482051&fexp=24001373%2C24007246&fvip=2&gir=yes&id=o-AK8GbbQovVxldcBz4pkXu4EA9N2sU-4yPPa5hFT3bXta&initcwndbps=1392500&ip=2003%3Ade%3Aaf1e%3A8a00%3A84c6%3A28f3%3A9de2%3A464&itag=251&keepalive=yes&lmt=1659767033119964&lsig=AG3C_xAwRAIgLFPuLqOoHoNQax15AE9Q2YIZ7pM7-olbGWgYGv1MDccCIADKSc_HeOdmD7CDs4AkY5ZtWF4gdZd4rw99Cqlzakbk&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fwebm&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1661460078&mv=m&mvi=4&n=LwUYrFgbIVPzmA&ns=bBqoZtLH6lsaX8ke0xgRMM8H&pl=37&rbqsm=fr&requiressl=yes&sig=AOq0QJ8wRQIhAKtzVVyoS46hkuKX31EyUE6X6Q5wotcToOCnYKswX3x_AiB0G2SUdVoso39bYgewd3zT8Pf77DrVtahXh4kVb46T9g%3D%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=lT-Khmjdu08WYG7DxAg_8xq0R2u5a6w&txp=4532434&vprv=1&xtags=lang%3Dfr"))]
+    #[case::br_fallback(StreamFilter::default().audio_max_bitrate(0).to_owned(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=6297404&dur=1012.661&ei=498HY6KvArqM6dsPiN6QgAE&expire=1661482051&fexp=24001373%2C24007246&fvip=2&gir=yes&id=o-AK8GbbQovVxldcBz4pkXu4EA9N2sU-4yPPa5hFT3bXta&initcwndbps=1392500&ip=2003%3Ade%3Aaf1e%3A8a00%3A84c6%3A28f3%3A9de2%3A464&itag=249&keepalive=yes&lmt=1659767062297621&lsig=AG3C_xAwRAIgLFPuLqOoHoNQax15AE9Q2YIZ7pM7-olbGWgYGv1MDccCIADKSc_HeOdmD7CDs4AkY5ZtWF4gdZd4rw99Cqlzakbk&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fwebm&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1661460078&mv=m&mvi=4&n=LwUYrFgbIVPzmA&ns=bBqoZtLH6lsaX8ke0xgRMM8H&pl=37&rbqsm=fr&requiressl=yes&sig=AOq0QJ8wRgIhAPm10DeIvOt5Oc7e36cfhPC0ej2PslQqF3-CFVUl5TNfAiEAlgvwjlQK14e_-6j3W_hMvk9KHax8zd5shSVlYSR1P34%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=lT-Khmjdu08WYG7DxAg_8xq0R2u5a6w&txp=4532434&vprv=1&xtags=lang%3Den"))]
+    #[case::lang_fallback(StreamFilter::default().audio_language("xx").to_owned(), Some("https://rr4---sn-h0jeener.googlevideo.com/videoplayback?c=WEB&clen=16104134&dur=1012.661&ei=498HY6KvArqM6dsPiN6QgAE&expire=1661482051&fexp=24001373%2C24007246&fvip=2&gir=yes&id=o-AK8GbbQovVxldcBz4pkXu4EA9N2sU-4yPPa5hFT3bXta&initcwndbps=1392500&ip=2003%3Ade%3Aaf1e%3A8a00%3A84c6%3A28f3%3A9de2%3A464&itag=251&keepalive=yes&lmt=1659767097097120&lsig=AG3C_xAwRAIgLFPuLqOoHoNQax15AE9Q2YIZ7pM7-olbGWgYGv1MDccCIADKSc_HeOdmD7CDs4AkY5ZtWF4gdZd4rw99Cqlzakbk&lsparams=mh%2Cmm%2Cmn%2Cms%2Cmv%2Cmvi%2Cpl%2Cinitcwndbps&mh=wB&mime=audio%2Fwebm&mm=31%2C29&mn=sn-h0jeener%2Csn-h0jeln7l&ms=au%2Crdu&mt=1661460078&mv=m&mvi=4&n=LwUYrFgbIVPzmA&ns=bBqoZtLH6lsaX8ke0xgRMM8H&pl=37&rbqsm=fr&requiressl=yes&sig=AOq0QJ8wRQIgW4IxGJJFRAwZefvDdDkJfjhN7y3bPmh96BCFuyFn6pwCIQDW6pVnk_DwMC3FcZy5rXNUULMNWLdadScxwuhFTFR84g%3D%3D&source=youtube&sparams=expire%2Cei%2Cip%2Cid%2Citag%2Csource%2Crequiressl%2Cspc%2Cvprv%2Cxtags%2Cmime%2Cns%2Cgir%2Cclen%2Cdur%2Clmt&spc=lT-Khmjdu08WYG7DxAg_8xq0R2u5a6w&txp=4532434&vprv=1&xtags=lang%3Den"))]
    #[case::noformat(StreamFilter::default().audio_formats(&[]).to_owned(), None)]
    #[case::nocodec(StreamFilter::default().audio_codecs(&[]).to_owned(), None)]
    fn t_select_audio_stream(#[case] filter: StreamFilter, #[case] expect_url: Option<&str>) {
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@ -83,18 +83,6 @@ pub fn generate_content_playback_nonce() -> String {
    random_string(CONTENT_PLAYBACK_NONCE_ALPHABET, 16)
 }

-pub fn random_uuid() -> String {
-    let mut rng = rand::thread_rng();
-    format!(
-        "{:08x}-{:04x}-{:04x}-{:04x}-{:012x}",
-        rng.gen::<u32>(),
-        rng.gen::<u16>(),
-        rng.gen::<u16>(),
-        rng.gen::<u16>(),
-        rng.gen::<u64>() & 0xffffffffffff,
-    )
-}
-
 /// Split an URL into its base string and parameter map
 ///
 /// Example:
@ -618,16 +606,4 @@ pub(crate) mod tests {
        let res_str = res.join(" ");
        assert_eq!(res_str, teststr)
    }
-
-    #[rstest]
-    #[case("en", Some(Language::En))]
-    #[case("en-GB", Some(Language::EnGb))]
-    #[case("en-US", Some(Language::En))]
-    #[case("en-ZZ", Some(Language::En))]
-    #[case("xy", None)]
-    #[case("xy-ZZ", None)]
-    fn parse_language(#[case] s: &str, #[case] expect: Option<Language>) {
-        let res = Language::from_str(s).ok();
-        assert_eq!(res, expect);
-    }
 }
--- a/src/util/protobuf.rs
+++ b/src/util/protobuf.rs
@ -45,13 +45,6 @@ impl ProtoBuilder {
        self._varint(val);
    }

-    /// Write a string field
-    pub fn string(&mut self, field: u32, string: &str) {
-        self._field(field, 2);
-        self._varint(string.len() as u64);
-        self.bytes.extend_from_slice(string.as_bytes());
-    }
-
    /// Write an embedded message
    ///
    /// Requires passing another [`ProtoBuilder`] with the embedded message.
@ -60,12 +53,6 @@ impl ProtoBuilder {
        self._varint(pb.bytes.len() as u64);
        self.bytes.append(&mut pb.bytes);
    }
-
-    /// Base64 + urlencode the protobuf data
-    pub fn to_base64(&self) -> String {
-        let b64 = super::b64_encode(&self.bytes);
-        urlencoding::encode(&b64).to_string()
-    }
 }

 fn parse_varint<P: Iterator<Item = u8>>(pb: &mut P) -> Option<u64> {
@ -137,6 +124,11 @@ mod tests {

    use super::*;

+    // #[test]
+    // fn t_parse_varint() {
+
+    // }
+
    #[test]
    fn t_parse_proto() {
        let p = "GhhVQzl2cnZOU0wzeGNXR1NrVjg2UkVCU2c%3D";
--- a/testfiles/dict/gen_lang_names.js
+++ b/testfiles/dict/gen_lang_names.js
@ -1,16 +0,0 @@
-const fs = require("fs");
-
-const dict = JSON.parse(fs.readFileSync("dictionary.json"));
-
-const intl = new Intl.DisplayNames(["en"], { type: "language" });
-
-let langs = Object.keys(dict);
-Object.values(dict).forEach(entry => {
-  if (entry.equivalent) {
-    langs.push(...entry.equivalent);
-  }
-});
-langs.sort();
-
-const res = Object.fromEntries(langs.map((l) => [l, intl.of(l)]));
-fs.writeFileSync("lang_names.json", JSON.stringify(res, null, 2));
--- a/testfiles/dict/lang_names.json
+++ b/testfiles/dict/lang_names.json
@ -1,85 +0,0 @@
-{
-  "af": "Afrikaans",
-  "am": "Amharic",
-  "ar": "Arabic",
-  "as": "Assamese",
-  "az": "Azerbaijani",
-  "be": "Belarusian",
-  "bg": "Bulgarian",
-  "bn": "Bangla",
-  "bs": "Bosnian",
-  "ca": "Catalan",
-  "cs": "Czech",
-  "da": "Danish",
-  "de": "German",
-  "el": "Greek",
-  "en": "English",
-  "en-GB": "British English",
-  "en-IN": "English (India)",
-  "es": "Spanish",
-  "es-419": "Latin American Spanish",
-  "es-US": "Spanish (United States)",
-  "et": "Estonian",
-  "eu": "Basque",
-  "fa": "Persian",
-  "fi": "Finnish",
-  "fil": "Filipino",
-  "fr": "French",
-  "fr-CA": "Canadian French",
-  "gl": "Galician",
-  "gu": "Gujarati",
-  "hi": "Hindi",
-  "hr": "Croatian",
-  "hu": "Hungarian",
-  "hy": "Armenian",
-  "id": "Indonesian",
-  "is": "Icelandic",
-  "it": "Italian",
-  "iw": "Hebrew",
-  "ja": "Japanese",
-  "ka": "Georgian",
-  "kk": "Kazakh",
-  "km": "Khmer",
-  "kn": "Kannada",
-  "ko": "Korean",
-  "ky": "Kyrgyz",
-  "lo": "Lao",
-  "lt": "Lithuanian",
-  "lv": "Latvian",
-  "mk": "Macedonian",
-  "ml": "Malayalam",
-  "mn": "Mongolian",
-  "mr": "Marathi",
-  "ms": "Malay",
-  "my": "Burmese",
-  "ne": "Nepali",
-  "nl": "Dutch",
-  "no": "Norwegian",
-  "or": "Odia",
-  "pa": "Punjabi",
-  "pl": "Polish",
-  "pt": "Portuguese",
-  "pt-PT": "European Portuguese",
-  "ro": "Romanian",
-  "ru": "Russian",
-  "si": "Sinhala",
-  "sk": "Slovak",
-  "sl": "Slovenian",
-  "sq": "Albanian",
-  "sr": "Serbian",
-  "sr-Latn": "Serbian (Latin)",
-  "sv": "Swedish",
-  "sw": "Swahili",
-  "ta": "Tamil",
-  "te": "Telugu",
-  "th": "Thai",
-  "tr": "Turkish",
-  "uk": "Ukrainian",
-  "ur": "Urdu",
-  "uz": "Uzbek",
-  "vi": "Vietnamese",
-  "zh-CN": "Chinese (China)",
-  "zh-HK": "Chinese (Hong Kong)",
-  "zh-TW": "Chinese (Taiwan)",
-  "zu": "Zulu"
-}
--- a/testfiles/player_model/hdr.json
+++ b/testfiles/player_model/hdr.json
@ -1124,6 +1124,5 @@
  "subtitles": [],
  "expires_in_seconds": 21540,
  "hls_manifest_url": null,
-  "dash_manifest_url": null,
-  "preview_frames": []
+  "dash_manifest_url": null
 }
--- a/testfiles/player_model/multilanguage.json
+++ b/testfiles/player_model/multilanguage.json
--- a/tests/youtube.rs
+++ b/tests/youtube.rs
@ -1,10 +1,10 @@
-use std::collections::HashMap;
+use std::collections::HashSet;
 use std::fmt::Display;
 use std::str::FromStr;

 use rstest::{fixture, rstest};
 use rustypipe::model::paginator::ContinuationEndpoint;
-use rustypipe::param::{ChannelOrder, ChannelVideoTab, Language};
+use rustypipe::param::Language;
 use rustypipe::validate;
 use time::macros::date;
 use time::OffsetDateTime;
@ -15,8 +15,8 @@ use rustypipe::model::{
    paginator::Paginator,
    richtext::ToPlaintext,
    traits::{FromYtItem, YtStream},
-    AlbumType, AudioCodec, AudioFormat, AudioTrackType, Channel, Frameset, MusicGenre,
-    MusicItemType, UrlTarget, Verification, VideoCodec, VideoFormat, YouTubeItem,
+    AlbumType, AudioCodec, AudioFormat, Channel, MusicGenre, MusicItemType, UrlTarget,
+    Verification, VideoCodec, VideoFormat, YouTubeItem,
 };
 use rustypipe::param::{
    search_filter::{self, SearchFilter},
@ -265,33 +265,18 @@ fn get_player(
                    stream
                        .track
                        .as_ref()
-                        .map(|t| (t.lang.as_deref().unwrap(), t.track_type.unwrap()))
+                        .map(|t| t.lang.as_ref().unwrap().to_owned())
                })
-                .collect::<HashMap<_, _>>();
+                .collect::<HashSet<_>>();

-            assert_eq!(
-                langs.get("en-US"),
-                Some(&AudioTrackType::Original),
-                "missing lang: en-US"
-            );
-
-            for l in ["es", "fr", "pt", "ru"] {
-                assert_eq!(
-                    langs.get(l),
-                    Some(&AudioTrackType::Dubbed),
-                    "missing lang: {l}"
-                );
+            for l in ["en", "es", "fr", "pt", "ru"] {
+                assert!(langs.contains(l), "missing lang: {l}");
            }
        }
        _ => {}
    };

    assert_gte(player_data.expires_in_seconds, 10_000, "expiry time");
-
-    if !is_live {
-        assert_gte(player_data.preview_frames.len(), 3, "preview framesets");
-        player_data.preview_frames.iter().for_each(assert_frameset);
-    }
 }

 #[rstest]
@ -794,11 +779,8 @@ fn channel_videos(rp: RustyPipe) {

 #[rstest]
 fn channel_shorts(rp: RustyPipe) {
-    let channel = tokio_test::block_on(
-        rp.query()
-            .channel_videos_tab("UCh8gHdtzO2tXd593_bjErWg", ChannelVideoTab::Shorts),
-    )
-    .unwrap();
+    let channel =
+        tokio_test::block_on(rp.query().channel_shorts("UCh8gHdtzO2tXd593_bjErWg")).unwrap();

    // dbg!(&channel);
    assert_eq!(channel.id, "UCh8gHdtzO2tXd593_bjErWg");
@ -827,11 +809,8 @@ fn channel_shorts(rp: RustyPipe) {

 #[rstest]
 fn channel_livestreams(rp: RustyPipe) {
-    let channel = tokio_test::block_on(
-        rp.query()
-            .channel_videos_tab("UC2DjFE7Xf11URZqWBigcVOQ", ChannelVideoTab::Live),
-    )
-    .unwrap();
+    let channel =
+        tokio_test::block_on(rp.query().channel_livestreams("UC2DjFE7Xf11URZqWBigcVOQ")).unwrap();

    // dbg!(&channel);
    assert_channel_eevblog(&channel);
@ -976,63 +955,6 @@ fn channel_more(
    assert_channel(&channel_info, id, name, unlocalized || name_unlocalized);
 }

-#[rstest]
-#[case::videos("UCcdwLMPsaU2ezNSJU1nFoBQ", ChannelVideoTab::Videos, "XqZsoesa55w")]
-#[case::shorts("UCcdwLMPsaU2ezNSJU1nFoBQ", ChannelVideoTab::Shorts, "k91vRvXGwHs")]
-#[case::live("UCvqRdlKsE5Q8mf8YXbdIJLw", ChannelVideoTab::Live, "ojes5ULOqhc")]
-fn channel_order(
-    #[case] id: &str,
-    #[case] tab: ChannelVideoTab,
-    #[case] most_popular: &str,
-    rp: RustyPipe,
-) {
-    let latest = tokio_test::block_on(rp.query().channel_videos_tab_order(
-        id,
-        tab,
-        ChannelOrder::Latest,
-    ))
-    .unwrap();
-    // Upload dates should be in descending order
-    if tab != ChannelVideoTab::Shorts {
-        let mut latest_items = latest.items.iter().peekable();
-        while let (Some(v), Some(next_v)) = (latest_items.next(), latest_items.peek()) {
-            if !v.is_upcoming && !v.is_live && !next_v.is_upcoming && !next_v.is_live {
-                assert_gte(
-                    v.publish_date.unwrap(),
-                    next_v.publish_date.unwrap(),
-                    "latest video date",
-                );
-            }
-        }
-    }
-    assert_next(latest, rp.query(), 15, 2);
-
-    let popular = tokio_test::block_on(rp.query().channel_videos_tab_order(
-        id,
-        tab,
-        ChannelOrder::Popular,
-    ))
-    .unwrap();
-    // Most popular video should be in top 5
-    assert!(
-        popular.items.iter().take(5).any(|v| v.id == most_popular),
-        "most popular video {most_popular} not found"
-    );
-
-    // View counts should be in descending order
-    if tab != ChannelVideoTab::Shorts {
-        let mut popular_items = popular.items.iter().peekable();
-        while let (Some(v), Some(next_v)) = (popular_items.next(), popular_items.peek()) {
-            assert_gte(
-                v.view_count.unwrap(),
-                next_v.view_count.unwrap(),
-                "most popular view count",
-            );
-        }
-    }
-    assert_next(popular, rp.query(), 15, 2);
-}
-
 #[rstest]
 #[case::not_exist("UCOpNcN46UbXVtpKMrmU4Abx")]
 #[case::gaming("UCOpNcN46UbXVtpKMrmU4Abg")]
@ -1050,19 +972,6 @@ fn channel_not_found(#[case] id: &str, rp: RustyPipe) {
    );
 }

-#[rstest]
-#[case::shorts(ChannelVideoTab::Shorts)]
-#[case::live(ChannelVideoTab::Live)]
-fn channel_tab_not_found(#[case] tab: ChannelVideoTab, rp: RustyPipe) {
-    let channel = tokio_test::block_on(
-        rp.query()
-            .channel_videos_tab("UCGiJh0NZ52wRhYKYnuZI08Q", tab),
-    )
-    .unwrap();
-
-    assert!(channel.content.is_empty(), "got: {:?}", channel.content);
-}
-
 //#CHANNEL_RSS

 #[cfg(feature = "rss")]
@ -1177,8 +1086,12 @@ fn search_suggestion(rp: RustyPipe) {

 #[rstest]
 fn search_suggestion_empty(rp: RustyPipe) {
-    let result =
-        tokio_test::block_on(rp.query().search_suggestion("fjew327p4ifjelwfvnewg49")).unwrap();
+    let result = tokio_test::block_on(
+        rp.query()
+            .lang(Language::Th)
+            .search_suggestion("fjew327p4ifjelwfvnewg49"),
+    )
+    .unwrap();

    assert!(result.is_empty());
 }
@ -2327,7 +2240,7 @@ fn assert_approx(left: f64, right: f64) {

 /// Assert that number A is greater than or equal to number B
 fn assert_gte<T: PartialOrd + Display>(a: T, b: T, msg: &str) {
-    assert!(a >= b, "expected >= {b} {msg}, got {a}");
+    assert!(a >= b, "expected {b} {msg}, got {a}");
 }

 /// Assert that the paginator produces at least n pages
@ -2380,15 +2293,3 @@ fn assert_album_id(id: &str) {
 fn assert_playlist_id(id: &str) {
    assert!(validate::playlist_id(id), "invalid playlist id: `{id}`");
 }
-
-fn assert_frameset(frameset: &Frameset) {
-    assert_gte(frameset.frame_height, 20, "frame height");
-    assert_gte(frameset.frame_height, 20, "frame width");
-    assert_gte(frameset.page_count, 1, "page count");
-    assert_gte(frameset.total_count, 50, "total count");
-    assert_gte(frameset.frames_per_page_x, 5, "frames per page x");
-    assert_gte(frameset.frames_per_page_y, 5, "frames per page y");
-
-    let n = frameset.urls().count() as u32;
-    assert_eq!(n, frameset.page_count);
-}